From fd7a43bbe280cf832976f3696776ff5df08de72e Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Thu, 21 Jul 2016 13:37:00 +0200 Subject: [PATCH] refactor computation package to make clean split between CE and task --- .../container/ComputeEngineContainerImpl.java | 6 +- .../ComputeEngineContainerImplTest.java | 2 +- .../org/sonar/ce/settings/SettingsLoader.java | 5 +- .../{queue => }/CeQueueModule.java | 8 +- ...ReportComputeEngineContainerPopulator.java | 235 ----------------- .../computation/developer/package-info.java | 23 -- .../computation/duplication/package-info.java | 23 -- .../computation/event/package-info.java | 23 -- .../computation/filesystem/package-info.java | 23 -- .../formula/counter/package-info.java | 23 -- .../formula/coverage/package-info.java | 23 -- .../computation/formula/package-info.java | 23 -- .../issue/commonrule/package-info.java | 23 -- .../issue/filter/package-info.java | 23 -- .../computation/issue/package-info.java | 23 -- .../computation/language/package-info.java | 23 -- .../computation/measure/api/package-info.java | 23 -- .../computation/measure/package-info.java | 23 -- .../computation/metric/package-info.java | 23 -- .../computation/period/package-info.java | 23 -- .../computation/posttask/package-info.java | 23 -- .../computation/qualitygate/package-info.java | 23 -- .../qualitymodel/package-info.java | 23 -- .../qualityprofile/package-info.java | 23 -- .../queue/report/package-info.java | 23 -- .../server/computation/scm/package-info.java | 23 -- .../computation/source/package-info.java | 23 -- .../server/computation/step/package-info.java | 23 -- .../{ => task}/container/EagerStart.java | 4 +- .../container/TaskContainer.java} | 4 +- .../container/TaskContainerImpl.java} | 12 +- .../container}/package-info.java | 2 +- .../ProjectAnalysisTaskModule.java} | 25 +- .../projectanalysis}/analysis/Analysis.java | 2 +- .../analysis/AnalysisMetadataHolder.java | 4 +- .../analysis/AnalysisMetadataHolderImpl.java | 4 +- .../MutableAnalysisMetadataHolder.java | 4 +- .../analysis/package-info.java | 23 ++ .../developer/PersistDevelopersDelegate.java | 2 +- .../api/developer/package-info.java | 23 ++ .../api/measurecomputer}/ComponentImpl.java | 2 +- .../MeasureComputerContextImpl.java | 32 +-- .../MeasureComputerDefinitionImpl.java | 2 +- .../MeasureComputerWrapper.java | 2 +- .../api/measurecomputer}/MeasureImpl.java | 20 +- .../api/measurecomputer/package-info.java | 23 ++ .../api}/posttask/CeTaskImpl.java | 2 +- .../api}/posttask/ConditionImpl.java | 2 +- .../api}/posttask/ConditionToCondition.java | 6 +- .../PostProjectAnalysisTasksExecutor.java | 20 +- .../api}/posttask/ProjectImpl.java | 2 +- .../api}/posttask/QualityGateImpl.java | 2 +- .../api/posttask/package-info.java | 23 ++ .../batch/BatchReportDirectoryHolder.java | 2 +- .../batch/BatchReportDirectoryHolderImpl.java | 2 +- .../batch/BatchReportReader.java | 2 +- .../batch/BatchReportReaderImpl.java | 2 +- .../MutableBatchReportDirectoryHolder.java | 2 +- .../projectanalysis/batch}/package-info.java | 3 +- .../projectanalysis}/component/Component.java | 2 +- .../component/ComponentCrawler.java | 2 +- .../component/ComponentFunctions.java | 2 +- .../component/ComponentImpl.java | 2 +- .../component/ComponentVisitor.java | 2 +- .../component/CrawlerDepthLimit.java | 2 +- .../component/DbIdsRepository.java | 2 +- .../component/DbIdsRepositoryImpl.java | 4 +- .../DepthTraversalTypeAwareCrawler.java | 2 +- .../component/DequeBasedPath.java | 2 +- .../projectanalysis}/component/Developer.java | 2 +- .../component/DisabledComponentsHolder.java | 2 +- .../DisabledComponentsHolderImpl.java | 2 +- .../component/FileAttributes.java | 4 +- .../component/MapBasedDbIdsRepository.java | 2 +- .../component/MutableDbIdsRepository.java | 2 +- .../MutableDisabledComponentsHolder.java | 2 +- .../component/MutableTreeRootHolder.java | 2 +- .../component/PathAwareCrawler.java | 6 +- .../component/PathAwareVisitor.java | 2 +- .../component/PathAwareVisitorAdapter.java | 2 +- .../component/PathAwareVisitorWrapper.java | 2 +- .../component/PathElementImpl.java | 2 +- .../component/ProjectViewAttributes.java | 2 +- .../component/ReportAttributes.java | 2 +- .../component/SettingsRepository.java | 2 +- .../component/SettingsRepositoryImpl.java | 2 +- .../component/TreeRootHolder.java | 2 +- .../component/TreeRootHolderImpl.java | 4 +- .../component/TypeAwareVisitor.java | 2 +- .../component/TypeAwareVisitorAdapter.java | 2 +- .../component/TypeAwareVisitorWrapper.java | 2 +- .../component/UuidFactory.java | 2 +- .../component/VisitException.java | 2 +- .../component/VisitorWrapper.java | 2 +- .../component/VisitorsCrawler.java | 2 +- .../component/package-info.java | 23 ++ .../container/ContainerFactory.java | 5 +- .../container/ContainerFactoryImpl.java | 8 +- ...ProjectAnalysisTaskContainerPopulator.java | 236 ++++++++++++++++++ .../container/package-info.java | 23 ++ .../duplication/AbstractDuplicate.java | 2 +- .../duplication/CrossProjectDuplicate.java | 2 +- .../CrossProjectDuplicationStatusHolder.java | 4 +- ...ossProjectDuplicationStatusHolderImpl.java | 4 +- .../duplication/DetailedTextBlock.java | 2 +- .../duplication/Duplicate.java | 2 +- .../duplication/Duplication.java | 2 +- .../duplication/DuplicationRepository.java | 4 +- .../DuplicationRepositoryImpl.java | 4 +- .../duplication/InProjectDuplicate.java | 4 +- .../duplication/InnerDuplicate.java | 2 +- .../IntegrateCrossProjectDuplications.java | 4 +- .../duplication/TextBlock.java | 2 +- .../duplication/package-info.java | 23 ++ .../projectanalysis}/event/Event.java | 2 +- .../event/EventRepository.java | 6 +- .../event/EventRepositoryImpl.java | 4 +- .../projectanalysis/event}/package-info.java | 2 +- .../filemove/FileMoveDetectionStep.java | 24 +- .../filemove/FileSimilarity.java | 2 +- .../filemove/FileSimilarityImpl.java | 2 +- .../projectanalysis}/filemove/Match.java | 2 +- .../filemove/MatchesByScore.java | 4 +- .../filemove/MovedFilesRepository.java | 4 +- .../filemove/MutableMovedFilesRepository.java | 6 +- .../MutableMovedFilesRepositoryImpl.java | 4 +- .../filemove/ScoreMatrix.java | 2 +- .../filemove/SourceSimilarity.java | 2 +- .../filemove/SourceSimilarityImpl.java | 2 +- .../filemove/package-info.java | 24 ++ .../ComputationTempFolderProvider.java | 2 +- .../filesystem/package-info.java | 23 ++ .../formula/AverageFormula.java | 4 +- .../projectanalysis}/formula/Counter.java | 4 +- .../formula/CounterInitializationContext.java | 8 +- .../formula/CreateMeasureContext.java | 8 +- .../formula/DistributionFormula.java | 8 +- .../projectanalysis}/formula/Formula.java | 4 +- .../FormulaExecutorComponentVisitor.java | 22 +- .../projectanalysis}/formula/SumFormula.java | 12 +- .../formula/VariationSumFormula.java | 14 +- .../formula/counter/DoubleVariationValue.java | 12 +- .../formula/counter/IntSumCounter.java | 6 +- .../formula/counter/IntVariationValue.java | 12 +- .../formula/counter/LongSumCounter.java | 6 +- .../formula/counter/LongVariationValue.java | 12 +- .../formula/counter/SumCounter.java | 4 +- .../formula/counter/package-info.java | 23 ++ .../formula/coverage/CoverageFormula.java | 14 +- .../formula/coverage/CoverageUtils.java | 18 +- .../coverage/CoverageVariationFormula.java | 20 +- .../ElementsAndCoveredElementsCounter.java | 8 +- ...ntsAndCoveredElementsVariationCounter.java | 10 +- ...inesAndConditionsWithUncoveredCounter.java | 6 +- ...inesAndConditionsWithUncoveredFormula.java | 2 +- ...sAndConditionsWithUncoveredMetricKeys.java | 2 +- ...nditionsWithUncoveredVariationCounter.java | 14 +- ...nditionsWithUncoveredVariationFormula.java | 2 +- .../coverage/SingleWithUncoveredCounter.java | 6 +- .../coverage/SingleWithUncoveredFormula.java | 2 +- .../SingleWithUncoveredMetricKeys.java | 2 +- .../SingleWithUncoveredVariationCounter.java | 14 +- .../SingleWithUncoveredVariationFormula.java | 2 +- .../formula/coverage/package-info.java | 23 ++ .../projectanalysis/formula/package-info.java | 23 ++ .../issue/BaseIssuesLoader.java | 6 +- ...CloseIssuesOnRemovedComponentsVisitor.java | 10 +- .../issue/ComponentIssuesRepository.java | 4 +- .../issue/ComponentIssuesRepositoryImpl.java | 4 +- .../ComponentsWithUnprocessedIssues.java | 2 +- .../issue/DebtCalculator.java | 2 +- .../issue/DefaultAssignee.java | 6 +- .../issue/EffortAggregator.java | 12 +- .../issue/IntegrateIssuesVisitor.java | 12 +- .../projectanalysis}/issue/IssueAssigner.java | 10 +- .../projectanalysis}/issue/IssueCache.java | 2 +- .../projectanalysis}/issue/IssueCounter.java | 18 +- .../issue/IssueLifecycle.java | 4 +- .../projectanalysis}/issue/IssueVisitor.java | 4 +- .../projectanalysis}/issue/IssueVisitors.java | 4 +- ...ComponentUuidsHavingOpenIssuesVisitor.java | 10 +- .../issue/MovedIssueVisitor.java | 10 +- .../MutableComponentIssuesRepository.java | 4 +- .../issue/NewEffortAggregator.java | 18 +- .../issue/NewEffortCalculator.java | 4 +- .../projectanalysis}/issue/Rule.java | 2 +- .../projectanalysis}/issue/RuleImpl.java | 2 +- .../issue/RuleRepository.java | 2 +- .../issue/RuleRepositoryImpl.java | 2 +- .../issue/RuleTagsCopier.java | 4 +- .../issue/RuleTypeCopier.java | 4 +- .../issue/ScmAccountToUser.java | 2 +- .../issue/ScmAccountToUserLoader.java | 2 +- .../issue/TrackerBaseInputFactory.java | 8 +- .../issue/TrackerExecution.java | 4 +- .../issue/TrackerRawInputFactory.java | 14 +- .../issue/UpdateConflictResolver.java | 2 +- .../commonrule/AbstractCoverageRule.java | 14 +- .../issue/commonrule/BranchCoverageRule.java | 8 +- .../issue/commonrule/CommentDensityRule.java | 16 +- .../issue/commonrule/CommonRule.java | 8 +- .../issue/commonrule/CommonRuleEngine.java | 4 +- .../commonrule/CommonRuleEngineImpl.java | 4 +- .../issue/commonrule/DuplicatedBlockRule.java | 16 +- .../issue/commonrule/LineCoverageRule.java | 8 +- .../issue/commonrule/SkippedTestRule.java | 16 +- .../issue/commonrule/TestErrorRule.java | 16 +- .../issue/commonrule/package-info.java | 23 ++ .../issue/filter/IssueFilter.java | 10 +- .../issue/filter/IssuePattern.java | 4 +- .../issue/filter/package-info.java | 23 ++ .../projectanalysis/issue/package-info.java | 23 ++ .../language/LanguageRepository.java | 2 +- .../language/LanguageRepositoryImpl.java | 2 +- .../language/package-info.java | 23 ++ .../measure/BatchMeasureToMeasure.java | 4 +- .../measure/BestValueOptimization.java | 8 +- .../measure/MapBasedRawMeasureRepository.java | 6 +- .../projectanalysis}/measure/Measure.java | 4 +- .../measure/MeasureComputersHolder.java | 4 +- .../measure/MeasureComputersHolderImpl.java | 4 +- .../measure/MeasureComputersVisitor.java | 24 +- .../measure/MeasureDtoToMeasure.java | 6 +- .../projectanalysis}/measure/MeasureKey.java | 4 +- .../measure/MeasureRepository.java | 8 +- .../measure/MeasureRepositoryImpl.java | 16 +- .../measure/MeasureToMeasureDto.java | 12 +- .../measure/MeasureVariations.java | 4 +- .../MutableMeasureComputersHolder.java | 4 +- .../measure/QualityGateStatus.java | 2 +- .../projectanalysis/measure/package-info.java | 23 ++ .../EvaluatedCondition.java | 6 +- .../QualityGateDetailsData.java | 6 +- .../qualitygatedetails/package-info.java | 23 ++ .../projectanalysis}/metric/Metric.java | 6 +- .../metric/MetricDtoToMetric.java | 4 +- .../projectanalysis}/metric/MetricImpl.java | 4 +- .../projectanalysis}/metric/MetricModule.java | 2 +- .../metric/MetricRepository.java | 2 +- .../metric/MetricRepositoryImpl.java | 2 +- .../metric/ReportMetricValidator.java | 2 +- .../metric/ReportMetricValidatorImpl.java | 2 +- .../projectanalysis/metric/package-info.java | 23 ++ .../projectanalysis}/package-info.java | 2 +- .../projectanalysis}/period/Period.java | 2 +- .../period/PeriodPredicates.java | 2 +- .../period/PeriodsHolder.java | 2 +- .../period/PeriodsHolderImpl.java | 4 +- .../projectanalysis/period/package-info.java | 23 ++ .../qualitygate/Condition.java | 4 +- .../qualitygate/ConditionEvaluator.java | 8 +- .../qualitygate/ConditionStatus.java | 2 +- .../qualitygate/EvaluationResult.java | 4 +- .../EvaluationResultTextConverter.java | 2 +- .../EvaluationResultTextConverterImpl.java | 12 +- .../qualitygate/MutableQualityGateHolder.java | 4 +- .../MutableQualityGateStatusHolder.java | 2 +- .../qualitygate/QualityGate.java | 2 +- .../qualitygate/QualityGateHolder.java | 2 +- .../qualitygate/QualityGateHolderImpl.java | 2 +- .../qualitygate/QualityGateService.java | 2 +- .../qualitygate/QualityGateServiceImpl.java | 6 +- .../qualitygate/QualityGateStatus.java | 2 +- .../qualitygate/QualityGateStatusHolder.java | 2 +- .../QualityGateStatusHolderImpl.java | 2 +- .../qualitygate/package-info.java | 23 ++ .../NewQualityModelMeasuresVisitor.java | 38 +-- .../QualityModelMeasuresVisitor.java | 24 +- .../qualitymodel/RatingGrid.java | 2 +- .../qualitymodel/RatingSettings.java | 2 +- .../qualitymodel/package-info.java | 23 ++ .../qualityprofile/ActiveRule.java | 2 +- .../qualityprofile/ActiveRulesHolder.java | 2 +- .../qualityprofile/ActiveRulesHolderImpl.java | 2 +- .../qualityprofile/QPMeasureData.java | 2 +- .../qualityprofile/QualityProfile.java | 2 +- .../qualityprofile/package-info.java | 23 ++ .../queue}/CleanReportQueueListener.java | 2 +- .../projectanalysis/queue/package-info.java | 23 ++ .../projectanalysis}/scm/Changeset.java | 2 +- .../projectanalysis}/scm/DbScmInfo.java | 4 +- .../projectanalysis}/scm/ReportScmInfo.java | 2 +- .../projectanalysis}/scm/ScmInfo.java | 2 +- .../projectanalysis}/scm/ScmInfoImpl.java | 2 +- .../scm/ScmInfoRepository.java | 4 +- .../scm/ScmInfoRepositoryImpl.java | 10 +- .../projectanalysis/scm}/package-info.java | 2 +- .../source/ComputeFileSourceData.java | 2 +- .../source/CoverageLineReader.java | 2 +- .../source/DuplicationLineReader.java | 10 +- .../source/HighlightingLineReader.java | 10 +- .../source/LastCommitVisitor.java | 24 +- .../projectanalysis}/source/LineReader.java | 2 +- .../source/RangeOffsetConverter.java | 2 +- .../source/ReportIterator.java | 2 +- .../source/ScmLineReader.java | 6 +- .../source/SourceHashRepository.java | 4 +- .../source/SourceHashRepositoryImpl.java | 4 +- .../source/SourceLinesRepository.java | 6 +- .../source/SourceLinesRepositoryImpl.java | 8 +- .../source/SymbolsLineReader.java | 8 +- .../projectanalysis/source/package-info.java | 23 ++ .../step/AbstractComputationSteps.java | 4 +- .../step/ApplyPermissionsStep.java | 21 +- .../step/BuildComponentTreeStep.java | 19 +- .../step/CommentMeasuresStep.java | 33 +-- .../step/ComplexityMeasuresStep.java | 21 +- .../step/ComputeMeasureVariationsStep.java | 35 +-- .../step/ComputeQProfileMeasureStep.java | 31 +-- .../step/CoverageMeasuresStep.java | 25 +- .../step/CustomMeasuresCopyStep.java | 23 +- .../step/DuplicationDataMeasuresStep.java | 37 +-- .../step/DuplicationMeasuresStep.java | 35 +-- .../step/EnableAnalysisStep.java | 9 +- .../step/ExecuteVisitorsStep.java | 9 +- .../step/ExtractReportStep.java | 5 +- .../step/GenerateAnalysisUuid.java | 5 +- .../step/IndexComponentsStep.java | 5 +- .../step/IndexIssuesStep.java | 5 +- .../projectanalysis}/step/IndexTestsStep.java | 5 +- .../LanguageDistributionMeasuresStep.java | 27 +- ...rossProjectDuplicationsRepositoryStep.java | 25 +- .../step/LoadDuplicationsFromReportStep.java | 31 +-- .../step/LoadMeasureComputersStep.java | 9 +- .../step/LoadPeriodsStep.java | 29 +-- .../step/LoadQualityGateStep.java | 23 +- .../step/LoadQualityProfilesStep.java | 13 +- .../LoadReportAnalysisMetadataHolderStep.java | 9 +- .../step/LogScannerContextStep.java | 5 +- .../step/NewCoverageMeasuresStep.java | 59 ++--- .../projectanalysis}/step/PeriodResolver.java | 4 +- .../step/PersistAnalysisStep.java | 19 +- .../step/PersistComponentsStep.java | 23 +- ...rsistCrossProjectDuplicationIndexStep.java | 21 +- .../step/PersistDevelopersStep.java | 5 +- .../step/PersistEventsStep.java | 21 +- .../step/PersistFileSourcesStep.java | 45 ++-- .../step/PersistIssuesStep.java | 9 +- .../step/PersistMeasuresStep.java | 27 +- .../step/PersistProjectLinksStep.java | 17 +- .../step/PersistTestsStep.java | 17 +- .../step/PublishTaskResultStep.java | 5 +- .../step/PurgeDatastoresStep.java | 25 +- .../step/QualityGateEventsStep.java | 29 +-- .../step/QualityGateMeasuresStep.java | 57 ++--- .../step/QualityProfileEventsStep.java | 33 +-- .../step/ReportComputationSteps.java | 29 +-- .../step/SendIssueNotificationsStep.java | 13 +- .../step/SizeMeasuresStep.java | 31 +-- .../step/UnitTestMeasuresStep.java | 33 +-- ...UpdateQualityProfilesLastUsedDateStep.java | 21 +- .../step/ValidateProjectStep.java | 19 +- .../projectanalysis/step/package-info.java | 23 ++ .../taskprocessor}/ReportTaskProcessor.java | 12 +- .../taskprocessor/package-info.java | 23 ++ .../{ => task}/step/ComputationStep.java | 4 +- .../step/ComputationStepExecutor.java | 4 +- .../{ => task}/step/ComputationSteps.java | 6 +- .../{analysis => task/step}/package-info.java | 2 +- .../taskprocessor/report/package-info.java | 23 -- .../step/ComputationStepsTest.java | 89 ------- .../container/TaskContainerImplTest.java} | 16 +- .../analysis/AnalysisImplTest.java | 2 +- .../AnalysisMetadataHolderImplTest.java | 2 +- .../analysis/AnalysisMetadataHolderRule.java | 4 +- .../MutableAnalysisMetadataHolderRule.java | 4 +- .../measurecomputer}/ComponentImplTest.java | 2 +- .../MeasureComputerContextImplTest.java | 28 +-- .../MeasureComputerDefinitionImplTest.java | 2 +- .../api/measurecomputer}/MeasureImplTest.java | 4 +- .../api}/posttask/CeTaskImplTest.java | 2 +- .../api}/posttask/ConditionImplTest.java | 2 +- .../posttask/ConditionToConditionTest.java | 8 +- .../PostProjectAnalysisTasksExecutorTest.java | 18 +- .../api}/posttask/ProjectImplTest.java | 2 +- .../api}/posttask/QualityGateImplTest.java | 2 +- .../BatchReportDirectoryHolderImplTest.java | 2 +- .../batch/BatchReportReaderImplTest.java | 2 +- .../batch/BatchReportReaderRule.java | 2 +- .../ImmutableBatchReportDirectoryHolder.java | 2 +- .../component/AbstractComponentProvider.java | 2 +- .../component/CallRecord.java | 2 +- .../CallRecorderPathAwareVisitor.java | 2 +- .../CallRecorderTypeAwareVisitor.java | 2 +- .../component/ComponentFunctionsTest.java | 14 +- .../component/ComponentImplTest.java | 4 +- .../component/ComponentProvider.java | 2 +- .../component/ComponentTest.java | 16 +- .../component/CrawlerDepthLimitTest.java | 4 +- .../component/DbIdsRepositoryImplTest.java | 4 +- .../DisabledComponentsHolderImplTest.java | 2 +- .../component/DumbDeveloper.java | 2 +- .../component/MutableDbIdsRepositoryRule.java | 3 +- .../component/MutableTreeRootHolderRule.java | 4 +- .../component/NoComponentProvider.java | 2 +- .../component/PathAwareCallRecord.java | 2 +- .../component/ReportComponent.java | 2 +- .../component/ReportPathAwareVisitorTest.java | 14 +- ...derDepthTraversalTypeAwareCrawlerTest.java | 12 +- ...derDepthTraversalTypeAwareCrawlerTest.java | 12 +- .../component/ReportVisitorsCrawlerTest.java | 14 +- ...sitorsCrawlerWithPathAwareVisitorTest.java | 14 +- ...wlerWithPostOrderTypeAwareVisitorTest.java | 12 +- ...awlerWithPreOrderTypeAwareVisitorTest.java | 12 +- .../component/SettingsRepositoryTest.java | 4 +- .../component/TreeComponentProvider.java | 2 +- .../TreeRootHolderComponentProvider.java | 2 +- .../component/TreeRootHolderImplTest.java | 16 +- .../component}/TreeRootHolderRule.java | 5 +- .../TypeAwareVisitorAdapterTest.java | 4 +- .../component/ViewsComponent.java | 2 +- .../component/ViewsPathAwareVisitorTest.java | 12 +- ...derDepthTraversalTypeAwareCrawlerTest.java | 10 +- ...derDepthTraversalTypeAwareCrawlerTest.java | 10 +- .../component/ViewsVisitorsCrawlerTest.java | 12 +- ...sitorsCrawlerWithPathAwareVisitorTest.java | 12 +- ...wlerWithPostOrderTypeAwareVisitorTest.java | 10 +- ...awlerWithPreOrderTypeAwareVisitorTest.java | 10 +- ...ctAnalysisTaskContainerPopulatorTest.java} | 40 +-- .../CrossProjectDuplicateTest.java | 2 +- ...rojectDuplicationStatusHolderImplTest.java | 4 +- .../duplication/DuplicateTest.java | 6 +- .../DuplicationRepositoryImplTest.java | 6 +- .../DuplicationRepositoryRule.java | 12 +- .../duplication/DuplicationTest.java | 6 +- .../duplication/InProjectDuplicateTest.java | 6 +- .../duplication/InnerDuplicateTest.java | 2 +- ...IntegrateCrossProjectDuplicationsTest.java | 10 +- .../duplication/TextBlockTest.java | 2 +- .../event/EventRepositoryImplTest.java | 8 +- .../projectanalysis}/event/EventTest.java | 2 +- .../filemove/FileMoveDetectionStepTest.java | 24 +- .../filemove/MatchesByScoreTest.java | 4 +- .../MutableMovedFilesRepositoryImplTest.java | 8 +- .../MutableMovedFilesRepositoryRule.java | 4 +- .../filemove/SourceSimilarityImplTest.java | 2 +- .../formula/AverageFormulaExecutionTest.java | 30 +-- .../formula/AverageFormulaTest.java | 14 +- .../DistributionFormulaExecutionTest.java | 28 +-- .../formula/DistributionFormulaTest.java | 12 +- .../formula/DumbCreateMeasureContext.java | 10 +- .../formula/IntSumFormulaTest.java | 18 +- .../formula/LongSumFormulaTest.java | 16 +- ...rtFormulaExecutorComponentVisitorTest.java | 40 +-- .../formula/SumFormulaExecutionTest.java | 30 +-- ...wsFormulaExecutorComponentVisitorTest.java | 40 +-- .../DoubleVariationValueArrayTest.java | 8 +- .../counter/DoubleVariationValueTest.java | 2 +- .../formula/counter/IntSumCounterTest.java | 6 +- .../counter/IntVariationValueArrayTest.java | 8 +- .../counter/IntVariationValueTest.java | 2 +- .../formula/counter/LongSumCounterTest.java | 6 +- .../counter/LongVariationValueArrayTest.java | 8 +- .../counter/LongVariationValueTest.java | 2 +- .../formula/coverage/CoverageUtilsTest.java | 20 +- ...eIssuesOnRemovedComponentsVisitorTest.java | 16 +- .../ComponentIssuesRepositoryImplTest.java | 6 +- .../issue/ComponentIssuesRepositoryRule.java | 12 +- .../ComponentsWithUnprocessedIssuesTest.java | 2 +- .../issue/DebtCalculatorTest.java | 2 +- .../issue/DefaultAssigneeTest.java | 8 +- .../projectanalysis}/issue/DumbRule.java | 2 +- .../issue/EffortAggregatorTest.java | 10 +- .../issue/FillComponentIssuesVisitorRule.java | 12 +- .../issue/IntegrateIssuesVisitorTest.java | 22 +- .../issue/IssueAssignerTest.java | 12 +- .../issue/IssueCounterTest.java | 26 +- .../issue/IssueLifecycleTest.java | 2 +- ...onentUuidsHavingOpenIssuesVisitorTest.java | 16 +- .../issue/MovedIssueVisitorTest.java | 10 +- .../issue/NewEffortAggregatorTest.java | 16 +- .../issue/NewEffortCalculatorTest.java | 4 +- .../issue/RuleRepositoryImplTest.java | 2 +- .../issue/RuleRepositoryRule.java | 2 +- .../issue/RuleTagsCopierTest.java | 4 +- .../issue/RuleTypeCopierTest.java | 4 +- .../issue/ScmAccountToUserLoaderTest.java | 2 +- .../issue/TrackerBaseInputFactoryTest.java | 8 +- .../issue/TrackerRawInputFactoryTest.java | 16 +- .../issue/UpdateConflictResolverTest.java | 2 +- .../commonrule/BranchCoverageRuleTest.java | 2 +- .../commonrule/CommentDensityRuleTest.java | 22 +- .../commonrule/CommonRuleEngineImplTest.java | 10 +- .../issue/commonrule/CommonRuleTest.java | 4 +- .../issue/commonrule/CoverageRuleTest.java | 22 +- .../commonrule/DuplicatedBlockRuleTest.java | 22 +- .../commonrule/LineCoverageRuleTest.java | 2 +- .../issue/commonrule/SkippedTestRuleTest.java | 22 +- .../issue/commonrule/TestErrorRuleTest.java | 22 +- .../issue/filter/IssueFilterTest.java | 12 +- .../issue/filter/IssuePatternTest.java | 2 +- .../language/LanguageRepositoryImplTest.java | 2 +- .../measure/BatchMeasureToMeasureTest.java | 6 +- .../measure/BestValueOptimizationTest.java | 12 +- .../MapBasedRawMeasureRepositoryTest.java | 20 +- .../measure/MeasureAssert.java | 2 +- .../MeasureComputersHolderImplTest.java | 4 +- .../measure/MeasureComputersHolderRule.java | 4 +- .../measure/MeasureDtoToMeasureTest.java | 8 +- .../measure/MeasureKeyTest.java | 6 +- .../measure/MeasureLevelTest.java | 2 +- .../measure/MeasureRepoEntry.java | 4 +- .../measure/MeasureRepositoryImplTest.java | 18 +- .../measure/MeasureRepositoryRule.java | 22 +- .../projectanalysis}/measure/MeasureTest.java | 10 +- .../measure/MeasureToMeasureDtoTest.java | 18 +- .../measure/MeasureVariationsTest.java | 8 +- .../measure/QualityGateStatusTest.java | 2 +- .../ReportMeasureComputersVisitorTest.java | 34 +-- .../ViewsMeasureComputersVisitorTest.java | 30 +-- .../EvaluatedConditionTest.java | 8 +- .../QualityGateDetailsDataTest.java | 10 +- .../metric/MetricDtoToMetricTest.java | 2 +- .../metric/MetricImplTest.java | 2 +- .../metric/MetricRepositoryImplTest.java | 2 +- .../metric/MetricRepositoryRule.java | 2 +- .../metric/ReportMetricValidatorImplTest.java | 2 +- .../period/PeriodPredicatesTest.java | 2 +- .../projectanalysis}/period/PeriodTest.java | 2 +- .../period/PeriodsHolderImplTest.java | 2 +- .../period/PeriodsHolderRule.java | 2 +- .../qualitygate/ConditionEvaluatorTest.java | 28 +-- .../qualitygate/ConditionStatusTest.java | 8 +- .../qualitygate/ConditionTest.java | 4 +- .../qualitygate/EvaluationResultAssert.java | 4 +- .../qualitygate/EvaluationResultTest.java | 4 +- .../EvaluationResultTextConverterTest.java | 16 +- .../MutableQualityGateHolderRule.java | 2 +- .../MutableQualityGateStatusHolderRule.java | 2 +- .../QualityGateHolderImplTest.java | 2 +- .../qualitygate/QualityGateHolderRule.java | 2 +- .../QualityGateServiceImplTest.java | 6 +- .../QualityGateStatusHolderImplTest.java | 2 +- .../NewQualityModelMeasuresVisitorTest.java | 42 ++-- ...lityModelMeasuresVisitorForReportTest.java | 50 ++-- ...alityModelMeasuresVisitorForViewsTest.java | 44 ++-- .../qualitymodel/RatingGridTest.java | 12 +- .../qualitymodel/RatingSettingsTest.java | 2 +- .../ActiveRulesHolderImplTest.java | 2 +- .../qualityprofile/ActiveRulesHolderRule.java | 2 +- .../qualityprofile/QualityProfileTest.java | 2 +- .../queue}/CleanReportQueueListenerTest.java | 2 +- .../projectanalysis}/scm/ChangesetTest.java | 2 +- .../projectanalysis}/scm/DbScmInfoTest.java | 6 +- .../scm/ReportScmInfoTest.java | 2 +- .../projectanalysis}/scm/ScmInfoImplTest.java | 2 +- .../scm/ScmInfoRepositoryImplTest.java | 26 +- .../scm/ScmInfoRepositoryRule.java | 4 +- .../source/ComputeFileSourceDataTest.java | 2 +- .../source/CoverageLineReaderTest.java | 2 +- .../source/DuplicationLineReaderTest.java | 18 +- .../source/HighlightingLineReaderTest.java | 8 +- .../source/LastCommitVisitorTest.java | 44 ++-- .../source/RangeOffsetConverterTest.java | 4 +- .../source/ReportIteratorTest.java | 2 +- .../source/ScmLineReaderTest.java | 8 +- .../source/SourceHashRepositoryImplTest.java | 8 +- .../source/SourceLinesRepositoryImplTest.java | 8 +- .../source/SourceLinesRepositoryRule.java | 6 +- .../source/SymbolsLineReaderTest.java | 6 +- .../step/ApplyPermissionsStepTest.java | 17 +- .../projectanalysis}/step/BaseStepTest.java | 3 +- .../step/BuildComponentTreeStepTest.java | 14 +- .../step/ComputeQProfileMeasureStepTest.java | 32 +-- .../step/CustomMeasuresCopyStepTest.java | 44 ++-- .../step/DuplicationDataMeasuresStepTest.java | 19 +- .../step/EnableAnalysisStepTest.java | 10 +- .../step/ExecuteVisitorsStepTest.java | 34 +-- .../step/ExtractReportStepTest.java | 4 +- .../step/IndexComponentsStepTest.java | 17 +- .../step/IndexIssuesStepTest.java | 10 +- .../step/IndexTestsStepTest.java | 9 +- ...ProjectDuplicationsRepositoryStepTest.java | 25 +- .../LoadDuplicationsFromReportStepTest.java | 30 +-- .../step/LoadMeasureComputersStepTest.java | 7 +- .../step/LoadPeriodsStepTest.java | 19 +- .../step/LoadQualityProfilesStepTest.java | 12 +- ...dReportAnalysisMetadataHolderStepTest.java | 7 +- .../step/LogScannerContextStepTest.java | 4 +- ...tCrossProjectDuplicationIndexStepTest.java | 15 +- .../step/PersistDevelopersStepTest.java | 4 +- .../step/PersistEventsStepTest.java | 25 +- .../step/PersistFileSourcesStepTest.java | 27 +- .../step/PersistIssuesStepTest.java | 11 +- .../step/PersistMeasuresStepTest.java | 45 ++-- .../step/PersistProjectLinksStepTest.java | 13 +- .../step/PersistTestsStepTest.java | 13 +- .../step/PublishTaskResultStepTest.java | 4 +- .../step/PurgeDatastoresStepTest.java | 17 +- .../step/QualityGateEventsStepTest.java | 28 +-- .../step/QualityGateLoadingStepTest.java | 20 +- .../step/QualityGateMeasuresStepTest.java | 54 ++-- .../step/QualityProfileEventsStepTest.java | 26 +- .../step/ReportCommentMeasuresStepTest.java | 21 +- .../ReportComplexityMeasuresStepTest.java | 27 +- .../step/ReportComputationStepsTest.java | 16 +- ...eportComputeMeasureVariationsStepTest.java | 30 +-- .../step/ReportCoverageMeasuresStepTest.java | 30 +-- .../ReportDuplicationMeasuresStepTest.java | 25 +- ...tLanguageDistributionMeasuresStepTest.java | 23 +- .../ReportNewCoverageMeasuresStepTest.java | 48 ++-- .../step/ReportPersistAnalysisStepTest.java | 17 +- .../step/ReportPersistComponentsStepTest.java | 21 +- .../step/ReportSizeMeasuresStepTest.java | 28 +-- .../step/ReportUnitTestMeasuresStepTest.java | 27 +- .../step/SendIssueNotificationsStepTest.java | 17 +- ...teQualityProfilesLastUsedDateStepTest.java | 20 +- .../step/ValidateProjectStepTest.java | 12 +- .../step/ViewsCommentMeasuresStepTest.java | 19 +- .../step/ViewsComplexityMeasuresStepTest.java | 25 +- ...ViewsComputeMeasureVariationsStepTest.java | 24 +- .../step/ViewsCoverageMeasuresStepTest.java | 26 +- .../ViewsDuplicationMeasuresStepTest.java | 19 +- ...sLanguageDistributionMeasuresStepTest.java | 19 +- .../ViewsNewCoverageMeasuresStepTest.java | 36 +-- .../step/ViewsPersistAnalysisStepTest.java | 21 +- .../step/ViewsPersistComponentsStepTest.java | 21 +- .../step/ViewsSizeMeasuresStepTest.java | 24 +- .../step/ViewsUnitTestMeasuresStepTest.java | 23 +- .../step/ComputationStepExecutorTest.java | 5 +- .../step}/StepsExplorer.java | 9 +- .../CeWorkerCallableImplTest.java | 2 +- .../activity/ActivityManagerTest/shared.xml | 34 --- ...dd_component_uuid_to_duplications_index.rb | 0 ...te_component_uuid_of_duplications_index.rb | 0 ...plications_index_rows_without_component.rb | 0 ...ent_uuid_not_null_on_duplications_index.rb | 0 ...add_analysis_uuid_to_duplications_index.rb | 0 ...ate_analysis_uuid_of_duplications_index.rb | 0 ...uplications_index_rows_without_analysis.rb | 0 ...sis_uuid_not_null_on_duplications_index.rb | 0 ...AnalysisUuidColumnToDuplicationsIndex.java | 0 ...omponentUuidColumnToDuplicationsIndex.java | 0 ...DuplicationsIndexRowsWithoutComponent.java | 0 ...mponentUuidNotNullOnDuplicationsIndex.java | 0 ...and_analysis_uuid_to_duplications_index.rb | 0 ...and_analysis_uuid_of_duplications_index.rb | 0 ...ndex_rows_without_component_or_analysis.rb | 0 ...sis_uuid_not_null_on_duplications_index.rb | 0 ...AnalysisUuidColumnToDuplicationsIndex.java | 0 ...nalysisUuidNotNullOnDuplicationsIndex.java | 0 .../ScmAccountToUserLoaderTest/charlie.json | 0 .../charlie_conflict.json | 0 .../issue/SourceLinesCacheTest/load_data.xml | 0 .../MeasureRepositoryImplTest/shared.xml | 0 .../measure/MetricCacheTest/metrics.xml | 0 .../MetricRepositoryImplTest/shared.xml | 0 .../report-custom-measures.xml | 0 .../view-custom-measures.xml | 0 .../IndexSourceLinesStepTest/index_source.xml | 0 .../step/IndexTestsStepTest/index_source.xml | 0 .../step/LoadPeriodsStepTest/empty.xml | 0 .../no_previous_version.xml | 0 .../previous_version_deleted.xml | 0 .../previous_version_is_last_one.xml | 0 .../step/LoadPeriodsStepTest/shared.xml | 0 .../unprocessed_snapshots.xml | 0 ...ersist_duplication_on_same_file-result.xml | 0 .../persist_duplication_on_same_file.xml | 0 .../add_events-result.xml | 0 .../add_version_event-result.xml | 0 .../step/PersistEventsStepTest/empty.xml | 0 .../keep_one_event_by_version-result.xml | 0 .../keep_one_event_by_version.xml | 0 ...nothing_to_do_when_no_events_in_report.xml | 0 ..._events_with_component_children-result.xml | 0 .../add_change-result.xml | 0 .../add_comment-result.xml | 0 .../close_issue-result.xml | 0 .../insert_new_issue.xml | 0 .../step/PersistIssuesStepTest/shared.xml | 0 .../step/PersistMeasuresStepTest/shared.xml | 0 .../empty.xml | 0 .../insert-from-index-result.xml | 0 .../insert-from-report-result.xml | 0 ...add_links_on_project_and_module-result.xml | 0 .../delete_link.xml | 0 .../PersistProjectLinksStepTest/empty.xml | 0 .../not_delete_custom_link.xml | 0 ...nothing_to_do_when_link_already_exists.xml | 0 .../update_link-result.xml | 0 .../update_link.xml | 0 .../step/ReportExtractionStepTest/demozip.zip | Bin .../step/SwitchSnapshotStepTest/empty.xml | 0 .../snapshots-result.xml | 0 .../step/SwitchSnapshotStepTest/snapshots.xml | 0 686 files changed, 3681 insertions(+), 3641 deletions(-) rename server/sonar-server/src/main/java/org/sonar/server/computation/{queue => }/CeQueueModule.java (82%) delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulator.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/developer/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/duplication/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/event/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/filesystem/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/formula/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/issue/filter/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/issue/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/language/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/measure/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/metric/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/period/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/posttask/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/scm/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/source/package-info.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/step/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task}/container/EagerStart.java (92%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{container/ComputeEngineContainer.java => task/container/TaskContainer.java} (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{container/ComputeEngineContainerImpl.java => task/container/TaskContainerImpl.java} (85%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{batch => task/container}/package-info.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{container/ReportProcessingModule.java => task/projectanalysis/ProjectAnalysisTaskModule.java} (60%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/analysis/Analysis.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/analysis/AnalysisMetadataHolder.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/analysis/AnalysisMetadataHolderImpl.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/analysis/MutableAnalysisMetadataHolder.java (93%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis/api}/developer/PersistDevelopersDelegate.java (93%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{measure/api => task/projectanalysis/api/measurecomputer}/ComponentImpl.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{measure/api => task/projectanalysis/api/measurecomputer}/MeasureComputerContextImpl.java (82%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{measure/api => task/projectanalysis/api/measurecomputer}/MeasureComputerDefinitionImpl.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{measure/api => task/projectanalysis/api/measurecomputer}/MeasureComputerWrapper.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{measure/api => task/projectanalysis/api/measurecomputer}/MeasureImpl.java (68%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis/api}/posttask/CeTaskImpl.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis/api}/posttask/ConditionImpl.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis/api}/posttask/ConditionToCondition.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis/api}/posttask/PostProjectAnalysisTasksExecutor.java (87%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis/api}/posttask/ProjectImpl.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis/api}/posttask/QualityGateImpl.java (96%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/batch/BatchReportDirectoryHolder.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/batch/BatchReportDirectoryHolderImpl.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/batch/BatchReportReader.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/batch/BatchReportReaderImpl.java (99%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/batch/MutableBatchReportDirectoryHolder.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{filemove => task/projectanalysis/batch}/package-info.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/Component.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ComponentCrawler.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ComponentFunctions.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ComponentImpl.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ComponentVisitor.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/CrawlerDepthLimit.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/DbIdsRepository.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/DbIdsRepositoryImpl.java (90%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/DepthTraversalTypeAwareCrawler.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/DequeBasedPath.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/Developer.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/DisabledComponentsHolder.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/DisabledComponentsHolderImpl.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/FileAttributes.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/MapBasedDbIdsRepository.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/MutableDbIdsRepository.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/MutableDisabledComponentsHolder.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/MutableTreeRootHolder.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/PathAwareCrawler.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/PathAwareVisitor.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/PathAwareVisitorAdapter.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/PathAwareVisitorWrapper.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/PathElementImpl.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ProjectViewAttributes.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ReportAttributes.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/SettingsRepository.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/SettingsRepositoryImpl.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/TreeRootHolder.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/TreeRootHolderImpl.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/TypeAwareVisitor.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/TypeAwareVisitorAdapter.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/TypeAwareVisitorWrapper.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/UuidFactory.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/VisitException.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/VisitorWrapper.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/component/VisitorsCrawler.java (99%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/container/ContainerFactory.java (80%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/container/ContainerFactoryImpl.java (71%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/AbstractDuplicate.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/CrossProjectDuplicate.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/CrossProjectDuplicationStatusHolder.java (89%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/CrossProjectDuplicationStatusHolderImpl.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/DetailedTextBlock.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/Duplicate.java (92%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/Duplication.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/DuplicationRepository.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/DuplicationRepositoryImpl.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/InProjectDuplicate.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/InnerDuplicate.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/IntegrateCrossProjectDuplications.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/TextBlock.java (97%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/event/Event.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/event/EventRepository.java (84%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/event/EventRepositoryImpl.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{measure/qualitygatedetails => task/projectanalysis/event}/package-info.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStep.java (92%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileSimilarity.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileSimilarityImpl.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/filemove/Match.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/filemove/MatchesByScore.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/filemove/MovedFilesRepository.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/filemove/MutableMovedFilesRepository.java (84%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/filemove/MutableMovedFilesRepositoryImpl.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/filemove/ScoreMatrix.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/filemove/SourceSimilarity.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/filemove/SourceSimilarityImpl.java (97%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/filesystem/ComputationTempFolderProvider.java (97%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/AverageFormula.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/Counter.java (90%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/CounterInitializationContext.java (83%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/CreateMeasureContext.java (82%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/DistributionFormula.java (90%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/Formula.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/FormulaExecutorComponentVisitor.java (90%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/SumFormula.java (88%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/VariationSumFormula.java (89%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/counter/DoubleVariationValue.java (88%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/counter/IntSumCounter.java (90%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/counter/IntVariationValue.java (88%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/counter/LongSumCounter.java (90%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/counter/LongVariationValue.java (88%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/counter/SumCounter.java (87%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/coverage/CoverageFormula.java (72%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/coverage/CoverageUtils.java (81%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/coverage/CoverageVariationFormula.java (70%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/coverage/ElementsAndCoveredElementsCounter.java (84%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/coverage/ElementsAndCoveredElementsVariationCounter.java (81%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/coverage/LinesAndConditionsWithUncoveredCounter.java (84%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/coverage/LinesAndConditionsWithUncoveredFormula.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/coverage/LinesAndConditionsWithUncoveredMetricKeys.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java (79%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/coverage/LinesAndConditionsWithUncoveredVariationFormula.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/coverage/SingleWithUncoveredCounter.java (83%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/coverage/SingleWithUncoveredFormula.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/coverage/SingleWithUncoveredMetricKeys.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/coverage/SingleWithUncoveredVariationCounter.java (72%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/coverage/SingleWithUncoveredVariationFormula.java (95%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/package-info.java create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/BaseIssuesLoader.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/CloseIssuesOnRemovedComponentsVisitor.java (85%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/ComponentIssuesRepository.java (92%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/ComponentIssuesRepositoryImpl.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/ComponentsWithUnprocessedIssues.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/DebtCalculator.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/DefaultAssignee.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/EffortAggregator.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/IntegrateIssuesVisitor.java (90%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/IssueAssigner.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/IssueCache.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/IssueCounter.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/IssueLifecycle.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/IssueVisitor.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/IssueVisitors.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/LoadComponentUuidsHavingOpenIssuesVisitor.java (79%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/MovedIssueVisitor.java (87%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/MutableComponentIssuesRepository.java (89%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/NewEffortAggregator.java (90%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/NewEffortCalculator.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/Rule.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/RuleImpl.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/RuleRepository.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/RuleRepositoryImpl.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/RuleTagsCopier.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/RuleTypeCopier.java (90%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/ScmAccountToUser.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/ScmAccountToUserLoader.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/TrackerBaseInputFactory.java (90%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/TrackerExecution.java (92%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/TrackerRawInputFactory.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/UpdateConflictResolver.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/commonrule/AbstractCoverageRule.java (84%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/commonrule/BranchCoverageRule.java (84%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/commonrule/CommentDensityRule.java (86%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/commonrule/CommonRule.java (90%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/commonrule/CommonRuleEngine.java (87%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/commonrule/CommonRuleEngineImpl.java (92%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/commonrule/DuplicatedBlockRule.java (76%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/commonrule/LineCoverageRule.java (84%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/commonrule/SkippedTestRule.java (75%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/commonrule/TestErrorRule.java (78%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/filter/IssueFilter.java (92%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/filter/IssuePattern.java (93%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/package-info.java create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/language/LanguageRepository.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/language/LanguageRepositoryImpl.java (96%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/BatchMeasureToMeasure.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/BestValueOptimization.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MapBasedRawMeasureRepository.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/Measure.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureComputersHolder.java (87%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureComputersHolderImpl.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureComputersVisitor.java (69%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureDtoToMeasure.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureKey.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureRepository.java (92%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureRepositoryImpl.java (87%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureToMeasureDto.java (89%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureVariations.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MutableMeasureComputersHolder.java (88%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/QualityGateStatus.java (97%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/qualitygatedetails/EvaluatedCondition.java (86%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/qualitygatedetails/QualityGateDetailsData.java (91%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/metric/Metric.java (90%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/metric/MetricDtoToMetric.java (92%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/metric/MetricImpl.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/metric/MetricModule.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/metric/MetricRepository.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/metric/MetricRepositoryImpl.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/metric/ReportMetricValidator.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/metric/ReportMetricValidatorImpl.java (97%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{container => task/projectanalysis}/package-info.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/period/Period.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/period/PeriodPredicates.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/period/PeriodsHolder.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/period/PeriodsHolderImpl.java (95%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/Condition.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/ConditionEvaluator.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/ConditionStatus.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/EvaluationResult.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/EvaluationResultTextConverter.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/EvaluationResultTextConverterImpl.java (89%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/MutableQualityGateHolder.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/MutableQualityGateStatusHolder.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/QualityGate.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/QualityGateHolder.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/QualityGateHolderImpl.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/QualityGateService.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/QualityGateServiceImpl.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/QualityGateStatus.java (92%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/QualityGateStatusHolder.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/QualityGateStatusHolderImpl.java (96%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitymodel/NewQualityModelMeasuresVisitor.java (85%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitymodel/QualityModelMeasuresVisitor.java (92%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitymodel/RatingGrid.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitymodel/RatingSettings.java (98%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualityprofile/ActiveRule.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualityprofile/ActiveRulesHolder.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualityprofile/ActiveRulesHolderImpl.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualityprofile/QPMeasureData.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/qualityprofile/QualityProfile.java (97%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{queue/report => task/projectanalysis/queue}/CleanReportQueueListener.java (95%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/queue/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/scm/Changeset.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/scm/DbScmInfo.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/scm/ReportScmInfo.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/scm/ScmInfo.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/scm/ScmInfoImpl.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/scm/ScmInfoRepository.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/scm/ScmInfoRepositoryImpl.java (92%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{component => task/projectanalysis/scm}/package-info.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/source/ComputeFileSourceData.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/source/CoverageLineReader.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/source/DuplicationLineReader.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/source/HighlightingLineReader.java (92%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/source/LastCommitVisitor.java (82%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/source/LineReader.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/source/RangeOffsetConverter.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/source/ReportIterator.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/source/ScmLineReader.java (90%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/source/SourceHashRepository.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/source/SourceHashRepositoryImpl.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/source/SourceLinesRepository.java (85%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/source/SourceLinesRepositoryImpl.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/source/SymbolsLineReader.java (94%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/AbstractComputationSteps.java (90%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ApplyPermissionsStep.java (75%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/BuildComponentTreeStep.java (87%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/CommentMeasuresStep.java (84%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ComplexityMeasuresStep.java (80%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ComputeMeasureVariationsStep.java (85%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ComputeQProfileMeasureStep.java (77%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/CoverageMeasuresStep.java (85%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/CustomMeasuresCopyStep.java (79%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/DuplicationDataMeasuresStep.java (75%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/DuplicationMeasuresStep.java (86%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/EnableAnalysisStep.java (83%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ExecuteVisitorsStep.java (85%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ExtractReportStep.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/GenerateAnalysisUuid.java (86%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/IndexComponentsStep.java (87%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/IndexIssuesStep.java (86%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/IndexTestsStep.java (86%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/LanguageDistributionMeasuresStep.java (81%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/LoadCrossProjectDuplicationsRepositoryStep.java (85%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/LoadDuplicationsFromReportStep.java (74%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/LoadMeasureComputersStep.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/LoadPeriodsStep.java (75%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/LoadQualityGateStep.java (76%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/LoadQualityProfilesStep.java (84%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/LoadReportAnalysisMetadataHolderStep.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/LogScannerContextStep.java (88%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/NewCoverageMeasuresStep.java (88%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PeriodResolver.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistAnalysisStep.java (87%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistComponentsStep.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistCrossProjectDuplicationIndexStep.java (80%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistDevelopersStep.java (86%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistEventsStep.java (84%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistFileSourcesStep.java (83%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistIssuesStep.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistMeasuresStep.java (80%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistProjectLinksStep.java (88%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistTestsStep.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PublishTaskResultStep.java (90%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PurgeDatastoresStep.java (70%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/QualityGateEventsStep.java (81%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/QualityGateMeasuresStep.java (80%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/QualityProfileEventsStep.java (82%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ReportComputationSteps.java (82%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/SendIssueNotificationsStep.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/SizeMeasuresStep.java (82%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/UnitTestMeasuresStep.java (80%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/UpdateQualityProfilesLastUsedDateStep.java (82%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ValidateProjectStep.java (92%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{taskprocessor/report => task/projectanalysis/taskprocessor}/ReportTaskProcessor.java (86%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task}/step/ComputationStep.java (88%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task}/step/ComputationStepExecutor.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => task}/step/ComputationSteps.java (86%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{analysis => task/step}/package-info.java (95%) delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/report/package-info.java delete mode 100644 server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepsTest.java rename server/sonar-server/src/test/java/org/sonar/server/computation/{container/ComputeEngineContainerImplTest.java => task/container/TaskContainerImplTest.java} (81%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/analysis/AnalysisImplTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/analysis/AnalysisMetadataHolderImplTest.java (99%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/analysis/AnalysisMetadataHolderRule.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/analysis/MutableAnalysisMetadataHolderRule.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{measure/api => task/projectanalysis/api/measurecomputer}/ComponentImplTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{measure/api => task/projectanalysis/api/measurecomputer}/MeasureComputerContextImplTest.java (89%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{measure/api => task/projectanalysis/api/measurecomputer}/MeasureComputerDefinitionImplTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{measure/api => task/projectanalysis/api/measurecomputer}/MeasureImplTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis/api}/posttask/CeTaskImplTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis/api}/posttask/ConditionImplTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis/api}/posttask/ConditionToConditionTest.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis/api}/posttask/PostProjectAnalysisTasksExecutorTest.java (91%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis/api}/posttask/ProjectImplTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis/api}/posttask/QualityGateImplTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/batch/BatchReportDirectoryHolderImplTest.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/batch/BatchReportReaderImplTest.java (99%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/batch/BatchReportReaderRule.java (99%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/batch/ImmutableBatchReportDirectoryHolder.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/AbstractComponentProvider.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/CallRecord.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/CallRecorderPathAwareVisitor.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/CallRecorderTypeAwareVisitor.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ComponentFunctionsTest.java (75%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ComponentImplTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ComponentProvider.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ComponentTest.java (82%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/CrawlerDepthLimitTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/DbIdsRepositoryImplTest.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/DisabledComponentsHolderImplTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/DumbDeveloper.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/MutableDbIdsRepositoryRule.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/MutableTreeRootHolderRule.java (90%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/NoComponentProvider.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/PathAwareCallRecord.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ReportComponent.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ReportPathAwareVisitorTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ReportVisitorsCrawlerTest.java (90%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ReportVisitorsCrawlerWithPathAwareVisitorTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/SettingsRepositoryTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/TreeComponentProvider.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/TreeRootHolderComponentProvider.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/TreeRootHolderImplTest.java (88%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{batch => task/projectanalysis/component}/TreeRootHolderRule.java (87%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/TypeAwareVisitorAdapterTest.java (85%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ViewsComponent.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ViewsPathAwareVisitorTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ViewsPostOrderDepthTraversalTypeAwareCrawlerTest.java (93%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ViewsPreOrderDepthTraversalTypeAwareCrawlerTest.java (93%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ViewsVisitorsCrawlerTest.java (91%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ViewsVisitorsCrawlerWithPathAwareVisitorTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/component/ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{container/ReportComputeEngineContainerPopulatorTest.java => task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java} (77%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/CrossProjectDuplicateTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/CrossProjectDuplicationStatusHolderImplTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/DuplicateTest.java (87%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/DuplicationRepositoryImplTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/DuplicationRepositoryRule.java (93%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/DuplicationTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/InProjectDuplicateTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/InnerDuplicateTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/IntegrateCrossProjectDuplicationsTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/duplication/TextBlockTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/event/EventRepositoryImplTest.java (91%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/event/EventTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStepTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/filemove/MatchesByScoreTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/filemove/MutableMovedFilesRepositoryImplTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/filemove/MutableMovedFilesRepositoryRule.java (93%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/filemove/SourceSimilarityImplTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/AverageFormulaExecutionTest.java (80%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/AverageFormulaTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/DistributionFormulaExecutionTest.java (79%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/DistributionFormulaTest.java (91%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/DumbCreateMeasureContext.java (80%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/IntSumFormulaTest.java (90%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/LongSumFormulaTest.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/ReportFormulaExecutorComponentVisitorTest.java (89%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/SumFormulaExecutionTest.java (76%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/ViewsFormulaExecutorComponentVisitorTest.java (88%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/counter/DoubleVariationValueArrayTest.java (93%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/counter/DoubleVariationValueTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/counter/IntSumCounterTest.java (91%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/counter/IntVariationValueArrayTest.java (93%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/counter/IntVariationValueTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/counter/LongSumCounterTest.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/counter/LongVariationValueArrayTest.java (93%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/counter/LongVariationValueTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/formula/coverage/CoverageUtilsTest.java (86%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/CloseIssuesOnRemovedComponentsVisitorTest.java (85%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/ComponentIssuesRepositoryImplTest.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/ComponentIssuesRepositoryRule.java (86%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/ComponentsWithUnprocessedIssuesTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/DebtCalculatorTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/DefaultAssigneeTest.java (89%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/DumbRule.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/EffortAggregatorTest.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/FillComponentIssuesVisitorRule.java (85%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/IntegrateIssuesVisitorTest.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/IssueAssignerTest.java (93%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/IssueCounterTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/IssueLifecycleTest.java (99%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java (76%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/MovedIssueVisitorTest.java (93%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/NewEffortAggregatorTest.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/NewEffortCalculatorTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/RuleRepositoryImplTest.java (99%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/RuleRepositoryRule.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/RuleTagsCopierTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/RuleTypeCopierTest.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/ScmAccountToUserLoaderTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/TrackerBaseInputFactoryTest.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/TrackerRawInputFactoryTest.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/UpdateConflictResolverTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/commonrule/BranchCoverageRuleTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/commonrule/CommentDensityRuleTest.java (86%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/commonrule/CommonRuleEngineImplTest.java (85%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/commonrule/CommonRuleTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/commonrule/CoverageRuleTest.java (82%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/commonrule/DuplicatedBlockRuleTest.java (77%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/commonrule/LineCoverageRuleTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/commonrule/SkippedTestRuleTest.java (78%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/commonrule/TestErrorRuleTest.java (80%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/filter/IssueFilterTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/issue/filter/IssuePatternTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/language/LanguageRepositoryImplTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/BatchMeasureToMeasureTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/BestValueOptimizationTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MapBasedRawMeasureRepositoryTest.java (93%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureAssert.java (99%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureComputersHolderImplTest.java (93%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureComputersHolderRule.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureDtoToMeasureTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureKeyTest.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureLevelTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureRepoEntry.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureRepositoryImplTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureRepositoryRule.java (93%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureToMeasureDtoTest.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureVariationsTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/QualityGateStatusTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/ReportMeasureComputersVisitorTest.java (81%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/ViewsMeasureComputersVisitorTest.java (86%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/qualitygatedetails/EvaluatedConditionTest.java (89%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/measure/qualitygatedetails/QualityGateDetailsDataTest.java (89%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/metric/MetricDtoToMetricTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/metric/MetricImplTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/metric/MetricRepositoryImplTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/metric/MetricRepositoryRule.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/metric/ReportMetricValidatorImplTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/period/PeriodPredicatesTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/period/PeriodTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/period/PeriodsHolderImplTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/period/PeriodsHolderRule.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/ConditionEvaluatorTest.java (90%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/ConditionStatusTest.java (89%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/ConditionTest.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/EvaluationResultAssert.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/EvaluationResultTest.java (91%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/EvaluationResultTextConverterTest.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/MutableQualityGateHolderRule.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/MutableQualityGateStatusHolderRule.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/QualityGateHolderImplTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/QualityGateHolderRule.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/QualityGateServiceImplTest.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitygate/QualityGateStatusHolderImplTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitymodel/NewQualityModelMeasuresVisitorTest.java (91%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitymodel/QualityModelMeasuresVisitorForReportTest.java (90%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitymodel/QualityModelMeasuresVisitorForViewsTest.java (85%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitymodel/RatingGridTest.java (79%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualitymodel/RatingSettingsTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualityprofile/ActiveRulesHolderImplTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualityprofile/ActiveRulesHolderRule.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/qualityprofile/QualityProfileTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{queue/report => task/projectanalysis/queue}/CleanReportQueueListenerTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/scm/ChangesetTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/scm/DbScmInfoTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/scm/ReportScmInfoTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/scm/ScmInfoImplTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/scm/ScmInfoRepositoryImplTest.java (91%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/scm/ScmInfoRepositoryRule.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/source/ComputeFileSourceDataTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/source/CoverageLineReaderTest.java (99%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/source/DuplicationLineReaderTest.java (89%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/source/HighlightingLineReaderTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/source/LastCommitVisitorTest.java (80%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/source/RangeOffsetConverterTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/source/ReportIteratorTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/source/ScmLineReaderTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/source/SourceHashRepositoryImplTest.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/source/SourceLinesRepositoryImplTest.java (93%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/source/SourceLinesRepositoryRule.java (90%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/source/SymbolsLineReaderTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ApplyPermissionsStepTest.java (91%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/BaseStepTest.java (90%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/BuildComponentTreeStepTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ComputeQProfileMeasureStepTest.java (80%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/CustomMeasuresCopyStepTest.java (81%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/DuplicationDataMeasuresStepTest.java (84%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/EnableAnalysisStepTest.java (89%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ExecuteVisitorsStepTest.java (81%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ExtractReportStepTest.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/IndexComponentsStepTest.java (74%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/IndexIssuesStepTest.java (80%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/IndexTestsStepTest.java (87%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/LoadCrossProjectDuplicationsRepositoryStepTest.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/LoadDuplicationsFromReportStepTest.java (87%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/LoadMeasureComputersStepTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/LoadPeriodsStepTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/LoadQualityProfilesStepTest.java (88%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/LoadReportAnalysisMetadataHolderStepTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/LogScannerContextStepTest.java (91%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistCrossProjectDuplicationIndexStepTest.java (88%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistDevelopersStepTest.java (89%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistEventsStepTest.java (81%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistFileSourcesStepTest.java (93%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistIssuesStepTest.java (93%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistMeasuresStepTest.java (88%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistProjectLinksStepTest.java (93%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistTestsStepTest.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PublishTaskResultStepTest.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/PurgeDatastoresStepTest.java (88%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/QualityGateEventsStepTest.java (91%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/QualityGateLoadingStepTest.java (84%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/QualityGateMeasuresStepTest.java (87%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/QualityProfileEventsStepTest.java (91%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ReportCommentMeasuresStepTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ReportComplexityMeasuresStepTest.java (88%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ReportComputationStepsTest.java (75%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ReportComputeMeasureVariationsStepTest.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ReportCoverageMeasuresStepTest.java (88%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ReportDuplicationMeasuresStepTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ReportLanguageDistributionMeasuresStepTest.java (84%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ReportNewCoverageMeasuresStepTest.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ReportPersistAnalysisStepTest.java (93%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ReportPersistComponentsStepTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ReportSizeMeasuresStepTest.java (88%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ReportUnitTestMeasuresStepTest.java (92%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/SendIssueNotificationsStepTest.java (91%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/UpdateQualityProfilesLastUsedDateStepTest.java (88%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ValidateProjectStepTest.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ViewsCommentMeasuresStepTest.java (93%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ViewsComplexityMeasuresStepTest.java (88%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ViewsComputeMeasureVariationsStepTest.java (91%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ViewsCoverageMeasuresStepTest.java (90%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ViewsDuplicationMeasuresStepTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ViewsLanguageDistributionMeasuresStepTest.java (84%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ViewsNewCoverageMeasuresStepTest.java (89%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ViewsPersistAnalysisStepTest.java (85%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ViewsPersistComponentsStepTest.java (93%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ViewsSizeMeasuresStepTest.java (90%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task/projectanalysis}/step/ViewsUnitTestMeasuresStepTest.java (91%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => task}/step/ComputationStepExecutorTest.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{container => task/step}/StepsExplorer.java (89%) delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/computation/activity/ActivityManagerTest/shared.xml rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStepTest/v1/1235_add_component_uuid_to_duplications_index.rb (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStepTest/v1/1236_populate_component_uuid_of_duplications_index.rb (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStepTest/v1/1237_delete_orphan_duplications_index_rows_without_component.rb (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStepTest/v1/1238_make_component_uuid_not_null_on_duplications_index.rb (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStepTest/v1/1239_add_analysis_uuid_to_duplications_index.rb (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStepTest/v1/1240_populate_analysis_uuid_of_duplications_index.rb (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStepTest/v1/1241_delete_orphan_duplications_index_rows_without_analysis.rb (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStepTest/v1/1242_make_analysis_uuid_not_null_on_duplications_index.rb (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStepTest/v1/AddAnalysisUuidColumnToDuplicationsIndex.java (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStepTest/v1/AddComponentUuidColumnToDuplicationsIndex.java (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStepTest/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStepTest/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStepTest/v2/1235_add_component_uuid_and_analysis_uuid_to_duplications_index.rb (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStepTest/v2/1236_populate_component_uuid_and_analysis_uuid_of_duplications_index.rb (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStepTest/v2/1237_delete_orphan_duplications_index_rows_without_component_or_analysis.rb (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStepTest/v2/1238_make_component_uuid_and_analysis_uuid_not_null_on_duplications_index.rb (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStepTest/v2/AddComponentUuidAndAnalysisUuidColumnToDuplicationsIndex.java (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/filemove/FileMoveDetectionStepTest/v2/MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex.java (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/issue/ScmAccountToUserLoaderTest/charlie.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/issue/ScmAccountToUserLoaderTest/charlie_conflict.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/issue/SourceLinesCacheTest/load_data.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/measure/MeasureRepositoryImplTest/shared.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/measure/MetricCacheTest/metrics.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/metric/MetricRepositoryImplTest/shared.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/CustomMeasuresCopyStepTest/report-custom-measures.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/CustomMeasuresCopyStepTest/view-custom-measures.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/IndexSourceLinesStepTest/index_source.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/IndexTestsStepTest/index_source.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/LoadPeriodsStepTest/empty.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/LoadPeriodsStepTest/no_previous_version.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/LoadPeriodsStepTest/previous_version_deleted.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/LoadPeriodsStepTest/previous_version_is_last_one.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/LoadPeriodsStepTest/shared.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/LoadPeriodsStepTest/unprocessed_snapshots.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file-result.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistEventsStepTest/add_events-result.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistEventsStepTest/add_version_event-result.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistEventsStepTest/empty.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistEventsStepTest/keep_one_event_by_version-result.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistEventsStepTest/keep_one_event_by_version.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistEventsStepTest/nothing_to_do_when_no_events_in_report.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistEventsStepTest/persist_report_events_with_component_children-result.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistIssuesStepTest/add_change-result.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistIssuesStepTest/add_comment-result.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistIssuesStepTest/close_issue-result.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistIssuesStepTest/insert_new_issue.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistIssuesStepTest/shared.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistMeasuresStepTest/shared.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistNumberOfDaysSinceLastCommitStepTest/empty.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-index-result.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-report-result.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistProjectLinksStepTest/add_links_on_project_and_module-result.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistProjectLinksStepTest/delete_link.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistProjectLinksStepTest/empty.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistProjectLinksStepTest/not_delete_custom_link.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistProjectLinksStepTest/nothing_to_do_when_link_already_exists.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistProjectLinksStepTest/update_link-result.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/PersistProjectLinksStepTest/update_link.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/ReportExtractionStepTest/demozip.zip (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/SwitchSnapshotStepTest/empty.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/SwitchSnapshotStepTest/snapshots-result.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => task/projectanalysis}/step/SwitchSnapshotStepTest/snapshots.xml (100%) diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java index ed1873c396b..6c719cce92f 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java @@ -68,8 +68,8 @@ import org.sonar.server.component.ComponentCleanerService; import org.sonar.server.component.ComponentFinder; import org.sonar.server.component.ComponentService; import org.sonar.server.computation.CeModule; -import org.sonar.server.computation.container.ReportProcessingModule; -import org.sonar.server.computation.queue.CeQueueModule; +import org.sonar.server.computation.task.projectanalysis.ProjectAnalysisTaskModule; +import org.sonar.server.computation.CeQueueModule; import org.sonar.server.computation.queue.PurgeCeActivities; import org.sonar.server.computation.taskprocessor.CeTaskProcessorModule; import org.sonar.server.debt.DebtModelPluginRepository; @@ -551,7 +551,7 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer { // Compute engine (must be after Views and Developer Cockpit) CeModule.class, CeQueueModule.class, - ReportProcessingModule.class, + ProjectAnalysisTaskModule.class, CeTaskProcessorModule.class, // CeWsModule.class, no Web Service in CE diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java index 60cbe067609..a0df301ce02 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java @@ -86,7 +86,7 @@ public class ComputeEngineContainerImplTest { + 75 // level 4 + 7 // content of CeModule + 7 // content of CeQueueModule - + 4 // content of ReportProcessingModule + + 4 // content of ProjectAnalysisTaskModule + 4 // content of CeTaskProcessorModule ); assertThat(picoContainer.getParent().getComponentAdapters()).hasSize( diff --git a/server/sonar-server/src/main/java/org/sonar/ce/settings/SettingsLoader.java b/server/sonar-server/src/main/java/org/sonar/ce/settings/SettingsLoader.java index 2cc7d747ea5..f1af42124cd 100644 --- a/server/sonar-server/src/main/java/org/sonar/ce/settings/SettingsLoader.java +++ b/server/sonar-server/src/main/java/org/sonar/ce/settings/SettingsLoader.java @@ -20,10 +20,11 @@ package org.sonar.ce.settings; import org.picocontainer.Startable; -import org.sonar.server.computation.container.EagerStart; +import org.sonar.server.computation.task.container.EagerStart; +import org.sonar.server.computation.task.container.TaskContainerImpl; /** - * Add this class as the first components in the {@link org.sonar.server.computation.container.ComputeEngineContainerImpl} + * Add this class as the first components in the {@link TaskContainerImpl} * to trigger loading of Thread local specific {@link org.sonar.api.config.Settings} in {@link ThreadLocalSettings}. */ @EagerStart diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueueModule.java b/server/sonar-server/src/main/java/org/sonar/server/computation/CeQueueModule.java similarity index 82% rename from server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueueModule.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/CeQueueModule.java index 77b676f7dfc..6a630300745 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/CeQueueModule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/CeQueueModule.java @@ -17,13 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.queue; +package org.sonar.server.computation; import org.sonar.ce.queue.report.ReportFiles; import org.sonar.core.platform.Module; import org.sonar.server.computation.monitoring.CEQueueStatusImpl; import org.sonar.server.computation.monitoring.CeTasksMBeanImpl; -import org.sonar.server.computation.queue.report.CleanReportQueueListener; +import org.sonar.server.computation.queue.CeQueueCleaner; +import org.sonar.server.computation.queue.CeQueueInitializer; +import org.sonar.server.computation.queue.InternalCeQueueImpl; +import org.sonar.server.computation.task.projectanalysis.queue.CleanReportQueueListener; public class CeQueueModule extends Module { @Override @@ -38,7 +41,6 @@ public class CeQueueModule extends Module { // queue cleaning CeQueueCleaner.class, - CleanReportQueueListener.class, ReportFiles.class, // init queue state and queue processing diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulator.java b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulator.java deleted file mode 100644 index 1f447afc1e7..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulator.java +++ /dev/null @@ -1,235 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.server.computation.container; - -import java.util.Arrays; -import java.util.List; -import javax.annotation.Nullable; -import org.sonar.ce.queue.CeTask; -import org.sonar.ce.settings.SettingsLoader; -import org.sonar.core.issue.tracking.Tracker; -import org.sonar.core.platform.ContainerPopulator; -import org.sonar.plugin.ce.ReportAnalysisComponentProvider; -import org.sonar.server.computation.analysis.AnalysisMetadataHolderImpl; -import org.sonar.server.computation.batch.BatchReportDirectoryHolderImpl; -import org.sonar.server.computation.batch.BatchReportReaderImpl; -import org.sonar.server.computation.component.DbIdsRepositoryImpl; -import org.sonar.server.computation.component.DisabledComponentsHolderImpl; -import org.sonar.server.computation.component.SettingsRepositoryImpl; -import org.sonar.server.computation.component.TreeRootHolderImpl; -import org.sonar.server.computation.duplication.CrossProjectDuplicationStatusHolderImpl; -import org.sonar.server.computation.duplication.DuplicationRepositoryImpl; -import org.sonar.server.computation.duplication.IntegrateCrossProjectDuplications; -import org.sonar.server.computation.event.EventRepositoryImpl; -import org.sonar.server.computation.filemove.FileSimilarityImpl; -import org.sonar.server.computation.filemove.MutableMovedFilesRepositoryImpl; -import org.sonar.server.computation.filemove.SourceSimilarityImpl; -import org.sonar.server.computation.filesystem.ComputationTempFolderProvider; -import org.sonar.server.computation.issue.BaseIssuesLoader; -import org.sonar.server.computation.issue.CloseIssuesOnRemovedComponentsVisitor; -import org.sonar.server.computation.issue.ComponentIssuesRepositoryImpl; -import org.sonar.server.computation.issue.ComponentsWithUnprocessedIssues; -import org.sonar.server.computation.issue.DebtCalculator; -import org.sonar.server.computation.issue.DefaultAssignee; -import org.sonar.server.computation.issue.EffortAggregator; -import org.sonar.server.computation.issue.IntegrateIssuesVisitor; -import org.sonar.server.computation.issue.IssueAssigner; -import org.sonar.server.computation.issue.IssueCache; -import org.sonar.server.computation.issue.IssueCounter; -import org.sonar.server.computation.issue.IssueLifecycle; -import org.sonar.server.computation.issue.IssueVisitors; -import org.sonar.server.computation.issue.LoadComponentUuidsHavingOpenIssuesVisitor; -import org.sonar.server.computation.issue.MovedIssueVisitor; -import org.sonar.server.computation.issue.NewEffortAggregator; -import org.sonar.server.computation.issue.NewEffortCalculator; -import org.sonar.server.computation.issue.RuleRepositoryImpl; -import org.sonar.server.computation.issue.RuleTagsCopier; -import org.sonar.server.computation.issue.RuleTypeCopier; -import org.sonar.server.computation.issue.ScmAccountToUser; -import org.sonar.server.computation.issue.ScmAccountToUserLoader; -import org.sonar.server.computation.issue.TrackerBaseInputFactory; -import org.sonar.server.computation.issue.TrackerExecution; -import org.sonar.server.computation.issue.TrackerRawInputFactory; -import org.sonar.server.computation.issue.UpdateConflictResolver; -import org.sonar.server.computation.issue.commonrule.BranchCoverageRule; -import org.sonar.server.computation.issue.commonrule.CommentDensityRule; -import org.sonar.server.computation.issue.commonrule.CommonRuleEngineImpl; -import org.sonar.server.computation.issue.commonrule.DuplicatedBlockRule; -import org.sonar.server.computation.issue.commonrule.LineCoverageRule; -import org.sonar.server.computation.issue.commonrule.SkippedTestRule; -import org.sonar.server.computation.issue.commonrule.TestErrorRule; -import org.sonar.server.computation.issue.filter.IssueFilter; -import org.sonar.server.computation.language.LanguageRepositoryImpl; -import org.sonar.server.computation.measure.MeasureComputersHolderImpl; -import org.sonar.server.computation.measure.MeasureComputersVisitor; -import org.sonar.server.computation.measure.MeasureRepositoryImpl; -import org.sonar.server.computation.measure.MeasureToMeasureDto; -import org.sonar.server.computation.metric.MetricModule; -import org.sonar.server.computation.period.PeriodsHolderImpl; -import org.sonar.server.computation.posttask.PostProjectAnalysisTasksExecutor; -import org.sonar.server.computation.qualitygate.EvaluationResultTextConverterImpl; -import org.sonar.server.computation.qualitygate.QualityGateHolderImpl; -import org.sonar.server.computation.qualitygate.QualityGateServiceImpl; -import org.sonar.server.computation.qualitygate.QualityGateStatusHolderImpl; -import org.sonar.server.computation.qualitymodel.NewQualityModelMeasuresVisitor; -import org.sonar.server.computation.qualitymodel.QualityModelMeasuresVisitor; -import org.sonar.server.computation.qualitymodel.RatingSettings; -import org.sonar.server.computation.qualityprofile.ActiveRulesHolderImpl; -import org.sonar.server.computation.scm.ScmInfoRepositoryImpl; -import org.sonar.server.computation.source.LastCommitVisitor; -import org.sonar.server.computation.source.SourceHashRepositoryImpl; -import org.sonar.server.computation.source.SourceLinesRepositoryImpl; -import org.sonar.server.computation.step.ComputationStepExecutor; -import org.sonar.server.computation.step.ComputationSteps; -import org.sonar.server.computation.step.ReportComputationSteps; -import org.sonar.server.computation.taskprocessor.MutableTaskResultHolderImpl; -import org.sonar.server.view.index.ViewIndex; - -public final class ReportComputeEngineContainerPopulator implements ContainerPopulator { - private static final ReportAnalysisComponentProvider[] NO_REPORT_ANALYSIS_COMPONENT_PROVIDERS = new ReportAnalysisComponentProvider[0]; - - private final CeTask task; - private final ReportAnalysisComponentProvider[] componentProviders; - - public ReportComputeEngineContainerPopulator(CeTask task, @Nullable ReportAnalysisComponentProvider[] componentProviders) { - this.task = task; - this.componentProviders = componentProviders == null ? NO_REPORT_ANALYSIS_COMPONENT_PROVIDERS : componentProviders; - } - - @Override - public void populateContainer(ComputeEngineContainer container) { - ComputationSteps steps = new ReportComputationSteps(container); - container.add(SettingsLoader.class); - container.add(task); - container.add(steps); - container.addSingletons(componentClasses()); - for (ReportAnalysisComponentProvider componentProvider : componentProviders) { - container.addSingletons(componentProvider.getComponents()); - } - container.addSingletons(steps.orderedStepClasses()); - } - - /** - * List of all objects to be injected in the picocontainer dedicated to computation stack. - * Does not contain the steps declared in {@link ReportComputationSteps#orderedStepClasses()}. - */ - private static List componentClasses() { - return Arrays.asList( - PostProjectAnalysisTasksExecutor.class, - ComputationStepExecutor.class, - - // File System - new ComputationTempFolderProvider(), - - MetricModule.class, - - // holders - AnalysisMetadataHolderImpl.class, - CrossProjectDuplicationStatusHolderImpl.class, - BatchReportDirectoryHolderImpl.class, - TreeRootHolderImpl.class, - PeriodsHolderImpl.class, - QualityGateHolderImpl.class, - QualityGateStatusHolderImpl.class, - RatingSettings.class, - ActiveRulesHolderImpl.class, - MeasureComputersHolderImpl.class, - MutableTaskResultHolderImpl.class, - - BatchReportReaderImpl.class, - - // repositories - LanguageRepositoryImpl.class, - MeasureRepositoryImpl.class, - EventRepositoryImpl.class, - SettingsRepositoryImpl.class, - DbIdsRepositoryImpl.class, - DisabledComponentsHolderImpl.class, - QualityGateServiceImpl.class, - EvaluationResultTextConverterImpl.class, - SourceLinesRepositoryImpl.class, - SourceHashRepositoryImpl.class, - ScmInfoRepositoryImpl.class, - DuplicationRepositoryImpl.class, - - // issues - RuleRepositoryImpl.class, - ScmAccountToUserLoader.class, - ScmAccountToUser.class, - IssueCache.class, - DefaultAssignee.class, - IssueVisitors.class, - IssueLifecycle.class, - ComponentsWithUnprocessedIssues.class, - ComponentIssuesRepositoryImpl.class, - IssueFilter.class, - - // common rules - CommonRuleEngineImpl.class, - BranchCoverageRule.class, - LineCoverageRule.class, - CommentDensityRule.class, - DuplicatedBlockRule.class, - TestErrorRule.class, - SkippedTestRule.class, - - // order is important: RuleTypeCopier must be the first one. And DebtAggregator must be before NewDebtAggregator (new debt requires - // debt) - RuleTypeCopier.class, - RuleTagsCopier.class, - DebtCalculator.class, - EffortAggregator.class, - NewEffortCalculator.class, - NewEffortAggregator.class, - IssueAssigner.class, - IssueCounter.class, - MovedIssueVisitor.class, - - // visitors : order is important, measure computers must be executed at the end in order to access to every measures / issues - LoadComponentUuidsHavingOpenIssuesVisitor.class, - IntegrateIssuesVisitor.class, - CloseIssuesOnRemovedComponentsVisitor.class, - QualityModelMeasuresVisitor.class, - NewQualityModelMeasuresVisitor.class, - LastCommitVisitor.class, - MeasureComputersVisitor.class, - - UpdateConflictResolver.class, - TrackerBaseInputFactory.class, - TrackerRawInputFactory.class, - Tracker.class, - TrackerExecution.class, - BaseIssuesLoader.class, - - // filemove - SourceSimilarityImpl.class, - FileSimilarityImpl.class, - MutableMovedFilesRepositoryImpl.class, - - // duplication - IntegrateCrossProjectDuplications.class, - - // views - ViewIndex.class, - - MeasureToMeasureDto.class); - } - -} diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/developer/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/developer/package-info.java deleted file mode 100644 index 3ddfcdfcb98..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/developer/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.developer; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/package-info.java deleted file mode 100644 index 23b337b2d16..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.duplication; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/event/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/event/package-info.java deleted file mode 100644 index f2f55774f00..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/event/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.event; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/filesystem/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/filesystem/package-info.java deleted file mode 100644 index 195f5ed37d9..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/filesystem/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.filesystem; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/package-info.java deleted file mode 100644 index fe5a5dc0b60..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.formula.counter; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/package-info.java deleted file mode 100644 index e0381c633bf..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.formula.coverage; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/package-info.java deleted file mode 100644 index 1bf8c029596..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.formula; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/package-info.java deleted file mode 100644 index 7fc33845349..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.issue.commonrule; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/filter/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/filter/package-info.java deleted file mode 100644 index 08a42d67f03..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/filter/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.issue.filter; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/package-info.java deleted file mode 100644 index 08fc3d71f99..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.issue; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/language/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/language/package-info.java deleted file mode 100644 index 7821031ba03..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/language/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.language; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/package-info.java deleted file mode 100644 index d813017cb63..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.measure.api; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/package-info.java deleted file mode 100644 index fd27fb50779..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.measure; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/metric/package-info.java deleted file mode 100644 index c4d9d2b7327..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.metric; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/period/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/period/package-info.java deleted file mode 100644 index b38eb09292a..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/period/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.period; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/posttask/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/posttask/package-info.java deleted file mode 100644 index a01c923d669..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/posttask/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.posttask; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/package-info.java deleted file mode 100644 index 0735ab6f357..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.qualitygate; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/package-info.java deleted file mode 100644 index 9130571d66a..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.qualitymodel; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/package-info.java deleted file mode 100644 index 76eda6552d9..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.qualityprofile; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/package-info.java deleted file mode 100644 index 6db8a46bb2d..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.queue.report; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/scm/package-info.java deleted file mode 100644 index a6846954e01..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.scm; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/source/package-info.java deleted file mode 100644 index 3171aec180f..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.source; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/package-info.java deleted file mode 100644 index a88e0f274e8..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.step; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/container/EagerStart.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/EagerStart.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/computation/container/EagerStart.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/container/EagerStart.java index dad0732a672..e643040be37 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/container/EagerStart.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/EagerStart.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.container; +package org.sonar.server.computation.task.container; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -25,7 +25,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * Components with this annotation will be eagerly started when loaded into the {@link ComputeEngineContainerImpl}. + * Components with this annotation will be eagerly started when loaded into the {@link TaskContainerImpl}. */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainer.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainer.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainer.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainer.java index c510f198cae..95c8e382892 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainer.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.container; +package org.sonar.server.computation.task.container; import org.picocontainer.PicoContainer; import org.sonar.ce.queue.CeTask; @@ -27,7 +27,7 @@ import org.sonar.core.platform.ContainerPopulator; /** * The Compute Engine container. Created for a specific parent {@link ComponentContainer} and a specific {@link CeTask}. */ -public interface ComputeEngineContainer extends ContainerPopulator.Container { +public interface TaskContainer extends ContainerPopulator.Container { ComponentContainer getParent(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainerImpl.java similarity index 85% rename from server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainerImpl.java index a41d9254643..14ab0331f7e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainerImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.container; +package org.sonar.server.computation.task.container; import java.util.List; import org.picocontainer.ComponentAdapter; @@ -35,16 +35,16 @@ import org.sonar.core.platform.Module; import static java.util.Objects.requireNonNull; -public class ComputeEngineContainerImpl extends ComponentContainer implements ComputeEngineContainer { +public class TaskContainerImpl extends ComponentContainer implements TaskContainer { - public ComputeEngineContainerImpl(ComponentContainer parent, ContainerPopulator populator) { + public TaskContainerImpl(ComponentContainer parent, ContainerPopulator populator) { super(createContainer(requireNonNull(parent)), parent.getComponentByType(PropertyDefinitions.class)); populateContainer(requireNonNull(populator)); startComponents(); } - private void populateContainer(ContainerPopulator populator) { + private void populateContainer(ContainerPopulator populator) { populator.populateContainer(this); populateFromModules(); } @@ -77,12 +77,12 @@ public class ComputeEngineContainerImpl extends ComponentContainer implements Co try { stopComponents(); } catch (Throwable t) { - Loggers.get(ComputeEngineContainerImpl.class).error("Cleanup of container failed", t); + Loggers.get(TaskContainerImpl.class).error("Cleanup of container failed", t); } } @Override public String toString() { - return "ComputeEngineContainerImpl"; + return "TaskContainerImpl"; } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/package-info.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/computation/batch/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/container/package-info.java index 12f6b333477..ce392f28638 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.computation.batch; +package org.sonar.server.computation.task.container; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ReportProcessingModule.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/ProjectAnalysisTaskModule.java similarity index 60% rename from server/sonar-server/src/main/java/org/sonar/server/computation/container/ReportProcessingModule.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/ProjectAnalysisTaskModule.java index 1efe1b09380..7c4bb3b4980 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ReportProcessingModule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/ProjectAnalysisTaskModule.java @@ -17,21 +17,26 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.container; +package org.sonar.server.computation.task.projectanalysis; -import org.sonar.core.platform.Module; import org.sonar.ce.queue.report.ReportSubmitter; -import org.sonar.server.computation.taskprocessor.report.ReportTaskProcessor; -import org.sonar.server.computation.step.ComputationStepExecutor; +import org.sonar.core.platform.Module; +import org.sonar.server.computation.task.projectanalysis.container.ContainerFactoryImpl; +import org.sonar.server.computation.task.projectanalysis.queue.CleanReportQueueListener; +import org.sonar.server.computation.task.projectanalysis.taskprocessor.ReportTaskProcessor; +import org.sonar.server.computation.task.step.ComputationStepExecutor; -public class ReportProcessingModule extends Module { +public class ProjectAnalysisTaskModule extends Module { @Override protected void configureModule() { add( - ContainerFactoryImpl.class, - ComputationStepExecutor.class, - ReportTaskProcessor.class, - ReportSubmitter.class - ); + // queue + CleanReportQueueListener.class, + + // task + ContainerFactoryImpl.class, + ComputationStepExecutor.class, + ReportTaskProcessor.class, + ReportSubmitter.class); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/analysis/Analysis.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Analysis.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/analysis/Analysis.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Analysis.java index f926d24c526..54470a91992 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/analysis/Analysis.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Analysis.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.analysis; +package org.sonar.server.computation.task.projectanalysis.analysis; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/analysis/AnalysisMetadataHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolder.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/analysis/AnalysisMetadataHolder.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolder.java index fb577751321..fa96b6972b6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/analysis/AnalysisMetadataHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolder.java @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.analysis; +package org.sonar.server.computation.task.projectanalysis.analysis; import java.util.Map; import javax.annotation.CheckForNull; -import org.sonar.server.computation.qualityprofile.QualityProfile; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.QualityProfile; public interface AnalysisMetadataHolder { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/analysis/AnalysisMetadataHolderImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImpl.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/analysis/AnalysisMetadataHolderImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImpl.java index b279ca951ea..4ab56f9c11d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/analysis/AnalysisMetadataHolderImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImpl.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.analysis; +package org.sonar.server.computation.task.projectanalysis.analysis; import com.google.common.collect.ImmutableMap; import java.util.Map; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import org.sonar.server.computation.qualityprofile.QualityProfile; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.QualityProfile; import org.sonar.server.computation.util.InitializedProperty; import static com.google.common.base.Preconditions.checkState; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/analysis/MutableAnalysisMetadataHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolder.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/analysis/MutableAnalysisMetadataHolder.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolder.java index f72ad1639dc..ab6a5b58fe7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/analysis/MutableAnalysisMetadataHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolder.java @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.analysis; +package org.sonar.server.computation.task.projectanalysis.analysis; import java.util.Map; import javax.annotation.Nullable; -import org.sonar.server.computation.qualityprofile.QualityProfile; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.QualityProfile; public interface MutableAnalysisMetadataHolder extends AnalysisMetadataHolder { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/package-info.java new file mode 100644 index 00000000000..bc26c87c3f4 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.analysis; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/developer/PersistDevelopersDelegate.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/PersistDevelopersDelegate.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/developer/PersistDevelopersDelegate.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/PersistDevelopersDelegate.java index f8f60553365..de6270051b2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/developer/PersistDevelopersDelegate.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/PersistDevelopersDelegate.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.developer; +package org.sonar.server.computation.task.projectanalysis.api.developer; /** * This interface is used to delegate the persistence of developers to the Developer Cockpit plugin diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/package-info.java new file mode 100644 index 00000000000..69d18b379b5 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.api.developer; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/ComponentImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImpl.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/ComponentImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImpl.java index 7308c237dd7..162425edc12 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/ComponentImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure.api; +package org.sonar.server.computation.task.projectanalysis.api.measurecomputer; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/MeasureComputerContextImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java similarity index 82% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/MeasureComputerContextImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java index d3112cdd51d..4dd54052654 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/MeasureComputerContextImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure.api; +package org.sonar.server.computation.task.projectanalysis.api.measurecomputer; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -34,16 +34,16 @@ import org.sonar.api.ce.measure.Issue; import org.sonar.api.ce.measure.Measure; import org.sonar.api.ce.measure.Settings; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.SettingsRepository; -import org.sonar.server.computation.issue.ComponentIssuesRepository; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.component.SettingsRepository; +import org.sonar.server.computation.task.projectanalysis.issue.ComponentIssuesRepository; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; import static com.google.common.base.Preconditions.checkArgument; import static org.sonar.api.ce.measure.MeasureComputer.MeasureComputerContext; import static org.sonar.api.ce.measure.MeasureComputer.MeasureComputerDefinition; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; public class MeasureComputerContextImpl implements MeasureComputerContext { @@ -51,14 +51,14 @@ public class MeasureComputerContextImpl implements MeasureComputerContext { private final MeasureRepository measureRepository; private final MetricRepository metricRepository; - private final org.sonar.server.computation.component.Component internalComponent; + private final org.sonar.server.computation.task.projectanalysis.component.Component internalComponent; private final Component component; private final List componentIssues; private MeasureComputerDefinition definition; private Set allowedMetrics; - public MeasureComputerContextImpl(org.sonar.server.computation.component.Component component, SettingsRepository settings, + public MeasureComputerContextImpl(org.sonar.server.computation.task.projectanalysis.component.Component component, SettingsRepository settings, MeasureRepository measureRepository, MetricRepository metricRepository, ComponentIssuesRepository componentIssuesRepository) { this.settings = settings; this.internalComponent = component; @@ -114,7 +114,7 @@ public class MeasureComputerContextImpl implements MeasureComputerContext { @CheckForNull public Measure getMeasure(String metric) { validateInputMetric(metric); - Optional measure = measureRepository.getRawMeasure(internalComponent, metricRepository.getByKey(metric)); + Optional measure = measureRepository.getRawMeasure(internalComponent, metricRepository.getByKey(metric)); if (measure.isPresent()) { return new MeasureImpl(measure.get()); } @@ -182,15 +182,15 @@ public class MeasureComputerContextImpl implements MeasureComputerContext { return componentIssues; } - private static Component newComponent(org.sonar.server.computation.component.Component component) { + private static Component newComponent(org.sonar.server.computation.task.projectanalysis.component.Component component) { return new ComponentImpl( component.getKey(), Component.Type.valueOf(component.getType().name()), - component.getType() == org.sonar.server.computation.component.Component.Type.FILE + component.getType() == org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE ? new ComponentImpl.FileAttributesImpl(component.getFileAttributes().getLanguageKey(), component.getFileAttributes().isUnitTest()) : null); } - private class ComponentToMeasure implements Function> { + private class ComponentToMeasure implements Function> { private final Metric metric; @@ -199,17 +199,17 @@ public class MeasureComputerContextImpl implements MeasureComputerContext { } @Override - public Optional apply(@Nonnull org.sonar.server.computation.component.Component input) { + public Optional apply(@Nonnull org.sonar.server.computation.task.projectanalysis.component.Component input) { return measureRepository.getRawMeasure(input, metric); } } - private enum ToMeasureAPI implements Function, Measure> { + private enum ToMeasureAPI implements Function, Measure> { INSTANCE; @Nullable @Override - public Measure apply(@Nonnull Optional input) { + public Measure apply(@Nonnull Optional input) { return input.isPresent() ? new MeasureImpl(input.get()) : null; } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/MeasureComputerDefinitionImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImpl.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/MeasureComputerDefinitionImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImpl.java index e2001f414c2..f2091b05d00 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/MeasureComputerDefinitionImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure.api; +package org.sonar.server.computation.task.projectanalysis.api.measurecomputer; import com.google.common.collect.ImmutableSet; import java.util.Set; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/MeasureComputerWrapper.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerWrapper.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/MeasureComputerWrapper.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerWrapper.java index ca4530841c6..6311bb6b3a5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/MeasureComputerWrapper.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerWrapper.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure.api; +package org.sonar.server.computation.task.projectanalysis.api.measurecomputer; import javax.annotation.concurrent.Immutable; import org.sonar.api.ce.measure.MeasureComputer; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/MeasureImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImpl.java similarity index 68% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/MeasureImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImpl.java index f22793b5554..f4be3925088 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/api/MeasureImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure.api; +package org.sonar.server.computation.task.projectanalysis.api.measurecomputer; import java.util.EnumSet; import java.util.Locale; @@ -26,20 +26,20 @@ import org.sonar.api.ce.measure.Measure; import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; -import static org.sonar.server.computation.measure.Measure.ValueType.BOOLEAN; -import static org.sonar.server.computation.measure.Measure.ValueType.DOUBLE; -import static org.sonar.server.computation.measure.Measure.ValueType.INT; -import static org.sonar.server.computation.measure.Measure.ValueType.LONG; -import static org.sonar.server.computation.measure.Measure.ValueType.STRING; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.ValueType.BOOLEAN; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.ValueType.DOUBLE; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.ValueType.INT; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.ValueType.LONG; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.ValueType.STRING; @Immutable public class MeasureImpl implements Measure { - private static final EnumSet ALLOWED_VALUE_TYPES = EnumSet.of(INT, LONG, DOUBLE, STRING, BOOLEAN); + private static final EnumSet ALLOWED_VALUE_TYPES = EnumSet.of(INT, LONG, DOUBLE, STRING, BOOLEAN); - private final org.sonar.server.computation.measure.Measure measure; + private final org.sonar.server.computation.task.projectanalysis.measure.Measure measure; - public MeasureImpl(org.sonar.server.computation.measure.Measure measure) { + public MeasureImpl(org.sonar.server.computation.task.projectanalysis.measure.Measure measure) { this.measure = requireNonNull(measure, "Measure couldn't be null"); checkState(ALLOWED_VALUE_TYPES.contains(measure.getValueType()), String.format("Only following types are allowed %s", ALLOWED_VALUE_TYPES)); } @@ -74,7 +74,7 @@ public class MeasureImpl implements Measure { return measure.getBooleanValue(); } - private void checkValueType(org.sonar.server.computation.measure.Measure.ValueType expected) { + private void checkValueType(org.sonar.server.computation.task.projectanalysis.measure.Measure.ValueType expected) { checkState(measure.getValueType() == expected, String.format( "Value can not be converted to %s because current value type is a %s", expected.toString().toLowerCase(Locale.US), diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/package-info.java new file mode 100644 index 00000000000..119c15aaad1 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.api.measurecomputer; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/posttask/CeTaskImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImpl.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/posttask/CeTaskImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImpl.java index c95e52b705c..1e38bc068a5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/posttask/CeTaskImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.posttask; +package org.sonar.server.computation.task.projectanalysis.api.posttask; import javax.annotation.concurrent.Immutable; import org.sonar.api.ce.posttask.CeTask; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/posttask/ConditionImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImpl.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/posttask/ConditionImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImpl.java index 8cd92a9b67b..78ef18aebf8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/posttask/ConditionImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.posttask; +package org.sonar.server.computation.task.projectanalysis.api.posttask; import javax.annotation.CheckForNull; import javax.annotation.concurrent.Immutable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/posttask/ConditionToCondition.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToCondition.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/posttask/ConditionToCondition.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToCondition.java index 55df858f496..161e52841e7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/posttask/ConditionToCondition.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToCondition.java @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.posttask; +package org.sonar.server.computation.task.projectanalysis.api.posttask; import com.google.common.base.Function; import java.util.Map; import javax.annotation.Nonnull; import org.sonar.api.ce.posttask.QualityGate; -import org.sonar.server.computation.qualitygate.Condition; -import org.sonar.server.computation.qualitygate.ConditionStatus; +import org.sonar.server.computation.task.projectanalysis.qualitygate.Condition; +import org.sonar.server.computation.task.projectanalysis.qualitygate.ConditionStatus; import static com.google.common.base.Preconditions.checkState; import static java.lang.String.format; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/posttask/PostProjectAnalysisTasksExecutor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java similarity index 87% rename from server/sonar-server/src/main/java/org/sonar/server/computation/posttask/PostProjectAnalysisTasksExecutor.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java index d89b5718707..c2071a83d17 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/posttask/PostProjectAnalysisTasksExecutor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.posttask; +package org.sonar.server.computation.task.projectanalysis.api.posttask; import com.google.common.base.Optional; import java.util.Collection; @@ -30,13 +30,13 @@ import org.sonar.api.ce.posttask.CeTask; import org.sonar.api.ce.posttask.PostProjectAnalysisTask; import org.sonar.api.ce.posttask.Project; import org.sonar.api.ce.posttask.QualityGate; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.qualitygate.Condition; -import org.sonar.server.computation.qualitygate.ConditionStatus; -import org.sonar.server.computation.qualitygate.QualityGateHolder; -import org.sonar.server.computation.qualitygate.QualityGateStatus; -import org.sonar.server.computation.qualitygate.QualityGateStatusHolder; -import org.sonar.server.computation.step.ComputationStepExecutor; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.qualitygate.Condition; +import org.sonar.server.computation.task.projectanalysis.qualitygate.ConditionStatus; +import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateHolder; +import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateStatus; +import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateStatusHolder; +import org.sonar.server.computation.task.step.ComputationStepExecutor; import static com.google.common.collect.FluentIterable.from; import static java.lang.String.format; @@ -109,9 +109,9 @@ public class PostProjectAnalysisTasksExecutor implements ComputationStepExecutor @CheckForNull private QualityGateImpl createQualityGate(QualityGateHolder qualityGateHolder) { - Optional qualityGateOptional = qualityGateHolder.getQualityGate(); + Optional qualityGateOptional = qualityGateHolder.getQualityGate(); if (qualityGateOptional.isPresent()) { - org.sonar.server.computation.qualitygate.QualityGate qualityGate = qualityGateOptional.get(); + org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGate qualityGate = qualityGateOptional.get(); return new QualityGateImpl( String.valueOf(qualityGate.getId()), diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/posttask/ProjectImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImpl.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/posttask/ProjectImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImpl.java index 128a665948a..9e648bcf7d3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/posttask/ProjectImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.posttask; +package org.sonar.server.computation.task.projectanalysis.api.posttask; import javax.annotation.concurrent.Immutable; import org.sonar.api.ce.posttask.Project; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/posttask/QualityGateImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImpl.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/posttask/QualityGateImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImpl.java index 376327f0a8d..1981226cc8a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/posttask/QualityGateImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.posttask; +package org.sonar.server.computation.task.projectanalysis.api.posttask; import com.google.common.collect.ImmutableList; import java.util.Collection; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/package-info.java new file mode 100644 index 00000000000..17c899a2822 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.api.posttask; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportDirectoryHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolder.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportDirectoryHolder.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolder.java index d4f010d5cf3..0b79428bcf0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportDirectoryHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolder.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.batch; +package org.sonar.server.computation.task.projectanalysis.batch; import java.io.File; import org.sonar.ce.queue.CeTask; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportDirectoryHolderImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImpl.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportDirectoryHolderImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImpl.java index 7096fd53139..d091b85ad0f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportDirectoryHolderImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.batch; +package org.sonar.server.computation.task.projectanalysis.batch; import java.io.File; import java.util.Objects; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReader.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReader.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReader.java index 84ac8c306e1..41f68e6fe26 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReader.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.batch; +package org.sonar.server.computation.task.projectanalysis.batch; import com.google.common.base.Optional; import javax.annotation.CheckForNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReaderImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java similarity index 99% rename from server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReaderImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java index f4d80458401..af8a751d748 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReaderImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.batch; +package org.sonar.server.computation.task.projectanalysis.batch; import com.google.common.base.Optional; import com.google.common.base.Throwables; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/MutableBatchReportDirectoryHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/MutableBatchReportDirectoryHolder.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/batch/MutableBatchReportDirectoryHolder.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/MutableBatchReportDirectoryHolder.java index 1f8267369f4..1a5ae7db075 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/MutableBatchReportDirectoryHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/MutableBatchReportDirectoryHolder.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.batch; +package org.sonar.server.computation.task.projectanalysis.batch; import java.io.File; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/package-info.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/filemove/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/package-info.java index d146ba87dc9..6f9554967fd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/package-info.java @@ -18,7 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.computation.filemove; +package org.sonar.server.computation.task.projectanalysis.batch; import javax.annotation.ParametersAreNonnullByDefault; - diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/Component.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Component.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/Component.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Component.java index 114468e6113..a40a77f0093 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/Component.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Component.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.EnumSet; import java.util.List; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentCrawler.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentCrawler.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentCrawler.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentCrawler.java index 815fbfd83a3..1870c4b87d7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentCrawler.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentCrawler.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; /** * Allow to crawl a component tree from a given component diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentFunctions.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctions.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentFunctions.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctions.java index 614ae25fa88..6c972751d08 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentFunctions.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctions.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import com.google.common.base.Function; import javax.annotation.Nonnull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImpl.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImpl.java index 6d26474b0cb..8339fa1e5a2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentVisitor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentVisitor.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentVisitor.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentVisitor.java index 27b37faf107..e7f88888a99 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/ComponentVisitor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentVisitor.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; public interface ComponentVisitor { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/CrawlerDepthLimit.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimit.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/CrawlerDepthLimit.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimit.java index d16b30ca0c0..8ebaf676e49 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/CrawlerDepthLimit.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimit.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/DbIdsRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepository.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/DbIdsRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepository.java index 582258b4f0f..5cfcddbed53 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/DbIdsRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepository.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; public interface DbIdsRepository { /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/DbIdsRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImpl.java similarity index 90% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/DbIdsRepositoryImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImpl.java index 6c22907bfeb..a40264f797e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/DbIdsRepositoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImpl.java @@ -17,9 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; -import static org.sonar.server.computation.component.ComponentFunctions.toReportRef; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentFunctions.toReportRef; /** * Cache of persisted component (component id and snapshot id) that can be used in the persistence steps diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/DepthTraversalTypeAwareCrawler.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DepthTraversalTypeAwareCrawler.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/DepthTraversalTypeAwareCrawler.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DepthTraversalTypeAwareCrawler.java index cf3fd84f434..9b12805fb11 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/DepthTraversalTypeAwareCrawler.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DepthTraversalTypeAwareCrawler.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/DequeBasedPath.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DequeBasedPath.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/DequeBasedPath.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DequeBasedPath.java index 52826c3362d..d4bca477851 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/DequeBasedPath.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DequeBasedPath.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.ArrayDeque; import java.util.Deque; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/Developer.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Developer.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/Developer.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Developer.java index a64dd8edffc..71f13eb411e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/Developer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Developer.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; /** * Developers are created by the Developer Cockpit plugin diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/DisabledComponentsHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolder.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/DisabledComponentsHolder.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolder.java index 3279e1b754b..9684c3f0d6d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/DisabledComponentsHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolder.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.Collection; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/DisabledComponentsHolderImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImpl.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/DisabledComponentsHolderImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImpl.java index 2d582d6dbb3..86de9be7893 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/DisabledComponentsHolderImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.Collection; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/FileAttributes.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributes.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/FileAttributes.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributes.java index b9a41ec6751..43e6101220a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/FileAttributes.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributes.java @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import javax.annotation.CheckForNull; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; /** - * The attributes specific to a Component of type {@link org.sonar.server.computation.component.Component.Type#FILE}. + * The attributes specific to a Component of type {@link org.sonar.server.computation.task.projectanalysis.component.Component.Type#FILE}. */ @Immutable public class FileAttributes { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/MapBasedDbIdsRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MapBasedDbIdsRepository.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/MapBasedDbIdsRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MapBasedDbIdsRepository.java index dcc3a2e7788..e19905947d8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/MapBasedDbIdsRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MapBasedDbIdsRepository.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import com.google.common.base.Function; import java.util.HashMap; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/MutableDbIdsRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepository.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/MutableDbIdsRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepository.java index 0bd4eb19f32..471b58622b4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/MutableDbIdsRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepository.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; public interface MutableDbIdsRepository extends DbIdsRepository { /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/MutableDisabledComponentsHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDisabledComponentsHolder.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/MutableDisabledComponentsHolder.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDisabledComponentsHolder.java index 635a89a810b..15b40a36e9a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/MutableDisabledComponentsHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDisabledComponentsHolder.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.Collection; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/MutableTreeRootHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolder.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/MutableTreeRootHolder.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolder.java index 7acbd94f87e..779157f7a75 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/MutableTreeRootHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolder.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; public interface MutableTreeRootHolder extends TreeRootHolder { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/PathAwareCrawler.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCrawler.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/PathAwareCrawler.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCrawler.java index f86b03d2fca..ee223d3cf9d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/PathAwareCrawler.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCrawler.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import com.google.common.base.Function; import com.google.common.base.Joiner; @@ -27,8 +27,8 @@ import javax.annotation.concurrent.Immutable; import static com.google.common.collect.FluentIterable.from; import static java.lang.String.format; import static java.util.Objects.requireNonNull; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; /** * A {@link ComponentCrawler} which provide access to a representation of the path from the root to the currently visited diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/PathAwareVisitor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitor.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/PathAwareVisitor.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitor.java index cae0ff68bf5..106f7bec048 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/PathAwareVisitor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitor.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.NoSuchElementException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/PathAwareVisitorAdapter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorAdapter.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/PathAwareVisitorAdapter.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorAdapter.java index db5ff2a2086..88a5eafbfd4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/PathAwareVisitorAdapter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorAdapter.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/PathAwareVisitorWrapper.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorWrapper.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/PathAwareVisitorWrapper.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorWrapper.java index bf5f85218e4..dc1a8269386 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/PathAwareVisitorWrapper.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorWrapper.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import static java.lang.String.format; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/PathElementImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathElementImpl.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/PathElementImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathElementImpl.java index 3d794519256..e5750372285 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/PathElementImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathElementImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import javax.annotation.concurrent.Immutable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/ProjectViewAttributes.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ProjectViewAttributes.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/ProjectViewAttributes.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ProjectViewAttributes.java index e267b0dcb24..3997088e7f8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/ProjectViewAttributes.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ProjectViewAttributes.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/ReportAttributes.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ReportAttributes.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/ReportAttributes.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ReportAttributes.java index 579b15d2123..bf016899d7d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/ReportAttributes.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ReportAttributes.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/SettingsRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/SettingsRepository.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/SettingsRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/SettingsRepository.java index c0664b5f976..cd769420ec7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/SettingsRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/SettingsRepository.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import org.sonar.api.config.Settings; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/SettingsRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/SettingsRepositoryImpl.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/SettingsRepositoryImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/SettingsRepositoryImpl.java index d290f7b6130..19f5f5939f3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/SettingsRepositoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/SettingsRepositoryImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.Collection; import java.util.Map; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/TreeRootHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolder.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/TreeRootHolder.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolder.java index 441c1507b47..8478fdb874c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/TreeRootHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolder.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; public interface TreeRootHolder { /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/TreeRootHolderImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImpl.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/TreeRootHolderImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImpl.java index d8c65bd2e56..154bda1af4c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/TreeRootHolderImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import com.google.common.collect.ImmutableMap; import java.util.Map; @@ -26,7 +26,7 @@ import javax.annotation.CheckForNull; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; /** * Holds the reference to the root of the {@link Component} tree for the current CE run. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/TypeAwareVisitor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitor.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/TypeAwareVisitor.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitor.java index ee4b8fc8ffc..470b5b97390 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/TypeAwareVisitor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitor.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; /** * A {@link ComponentVisitor} which can exposes methods which ensure the type of the visited Component. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/TypeAwareVisitorAdapter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapter.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/TypeAwareVisitorAdapter.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapter.java index 4b9382eb91b..0933327b1a9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/TypeAwareVisitorAdapter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapter.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/TypeAwareVisitorWrapper.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorWrapper.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/TypeAwareVisitorWrapper.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorWrapper.java index 1409695a215..fc79ff0b05d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/TypeAwareVisitorWrapper.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorWrapper.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; public class TypeAwareVisitorWrapper implements VisitorWrapper { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/UuidFactory.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/UuidFactory.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/UuidFactory.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/UuidFactory.java index 628dc0dd0e2..80b4cbf747e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/UuidFactory.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/UuidFactory.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.HashMap; import java.util.List; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/VisitException.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitException.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/VisitException.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitException.java index 67ba075e45c..684a4edc3e6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/VisitException.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitException.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import static java.lang.String.format; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/VisitorWrapper.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorWrapper.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/VisitorWrapper.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorWrapper.java index 454b3517bfb..7b3bcf4a0c0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/VisitorWrapper.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorWrapper.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; public interface VisitorWrapper extends TypeAwareVisitor { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/VisitorsCrawler.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorsCrawler.java similarity index 99% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/VisitorsCrawler.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorsCrawler.java index b89216d64ae..667ba785790 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/VisitorsCrawler.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorsCrawler.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import com.google.common.base.Function; import com.google.common.base.Predicate; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/package-info.java new file mode 100644 index 00000000000..aee46ad50a3 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.component; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ContainerFactory.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactory.java similarity index 80% rename from server/sonar-server/src/main/java/org/sonar/server/computation/container/ContainerFactory.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactory.java index fe1b292278a..1e8363f65cc 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ContainerFactory.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactory.java @@ -17,14 +17,15 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.container; +package org.sonar.server.computation.task.projectanalysis.container; import javax.annotation.Nullable; import org.sonar.ce.queue.CeTask; import org.sonar.core.platform.ComponentContainer; import org.sonar.plugin.ce.ReportAnalysisComponentProvider; +import org.sonar.server.computation.task.container.TaskContainer; public interface ContainerFactory { - ComputeEngineContainer create(ComponentContainer parent, CeTask task, @Nullable ReportAnalysisComponentProvider[] componentProviders); + TaskContainer create(ComponentContainer parent, CeTask task, @Nullable ReportAnalysisComponentProvider[] componentProviders); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ContainerFactoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactoryImpl.java similarity index 71% rename from server/sonar-server/src/main/java/org/sonar/server/computation/container/ContainerFactoryImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactoryImpl.java index eaba445cf16..1adc3f5b0a1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ContainerFactoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactoryImpl.java @@ -17,16 +17,18 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.container; +package org.sonar.server.computation.task.projectanalysis.container; import javax.annotation.Nullable; import org.sonar.ce.queue.CeTask; import org.sonar.core.platform.ComponentContainer; import org.sonar.plugin.ce.ReportAnalysisComponentProvider; +import org.sonar.server.computation.task.container.TaskContainer; +import org.sonar.server.computation.task.container.TaskContainerImpl; public class ContainerFactoryImpl implements ContainerFactory { @Override - public ComputeEngineContainer create(ComponentContainer parent, CeTask task, @Nullable ReportAnalysisComponentProvider[] componentProviders) { - return new ComputeEngineContainerImpl(parent, new ReportComputeEngineContainerPopulator(task, componentProviders)); + public TaskContainer create(ComponentContainer parent, CeTask task, @Nullable ReportAnalysisComponentProvider[] componentProviders) { + return new TaskContainerImpl(parent, new ProjectAnalysisTaskContainerPopulator(task, componentProviders)); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java new file mode 100644 index 00000000000..5f455576977 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java @@ -0,0 +1,236 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.server.computation.task.projectanalysis.container; + +import java.util.Arrays; +import java.util.List; +import javax.annotation.Nullable; +import org.sonar.ce.queue.CeTask; +import org.sonar.ce.settings.SettingsLoader; +import org.sonar.core.issue.tracking.Tracker; +import org.sonar.core.platform.ContainerPopulator; +import org.sonar.plugin.ce.ReportAnalysisComponentProvider; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderImpl; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportDirectoryHolderImpl; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderImpl; +import org.sonar.server.computation.task.projectanalysis.component.DbIdsRepositoryImpl; +import org.sonar.server.computation.task.projectanalysis.component.DisabledComponentsHolderImpl; +import org.sonar.server.computation.task.projectanalysis.component.SettingsRepositoryImpl; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderImpl; +import org.sonar.server.computation.task.container.TaskContainer; +import org.sonar.server.computation.task.projectanalysis.duplication.CrossProjectDuplicationStatusHolderImpl; +import org.sonar.server.computation.task.projectanalysis.duplication.DuplicationRepositoryImpl; +import org.sonar.server.computation.task.projectanalysis.duplication.IntegrateCrossProjectDuplications; +import org.sonar.server.computation.task.projectanalysis.event.EventRepositoryImpl; +import org.sonar.server.computation.task.projectanalysis.filemove.FileSimilarityImpl; +import org.sonar.server.computation.task.projectanalysis.filemove.MutableMovedFilesRepositoryImpl; +import org.sonar.server.computation.task.projectanalysis.filemove.SourceSimilarityImpl; +import org.sonar.server.computation.task.projectanalysis.filesystem.ComputationTempFolderProvider; +import org.sonar.server.computation.task.projectanalysis.issue.BaseIssuesLoader; +import org.sonar.server.computation.task.projectanalysis.issue.CloseIssuesOnRemovedComponentsVisitor; +import org.sonar.server.computation.task.projectanalysis.issue.ComponentIssuesRepositoryImpl; +import org.sonar.server.computation.task.projectanalysis.issue.ComponentsWithUnprocessedIssues; +import org.sonar.server.computation.task.projectanalysis.issue.DebtCalculator; +import org.sonar.server.computation.task.projectanalysis.issue.DefaultAssignee; +import org.sonar.server.computation.task.projectanalysis.issue.EffortAggregator; +import org.sonar.server.computation.task.projectanalysis.issue.IntegrateIssuesVisitor; +import org.sonar.server.computation.task.projectanalysis.issue.IssueAssigner; +import org.sonar.server.computation.task.projectanalysis.issue.IssueCache; +import org.sonar.server.computation.task.projectanalysis.issue.IssueCounter; +import org.sonar.server.computation.task.projectanalysis.issue.IssueLifecycle; +import org.sonar.server.computation.task.projectanalysis.issue.IssueVisitors; +import org.sonar.server.computation.task.projectanalysis.issue.LoadComponentUuidsHavingOpenIssuesVisitor; +import org.sonar.server.computation.task.projectanalysis.issue.MovedIssueVisitor; +import org.sonar.server.computation.task.projectanalysis.issue.NewEffortAggregator; +import org.sonar.server.computation.task.projectanalysis.issue.NewEffortCalculator; +import org.sonar.server.computation.task.projectanalysis.issue.RuleRepositoryImpl; +import org.sonar.server.computation.task.projectanalysis.issue.RuleTagsCopier; +import org.sonar.server.computation.task.projectanalysis.issue.RuleTypeCopier; +import org.sonar.server.computation.task.projectanalysis.issue.ScmAccountToUser; +import org.sonar.server.computation.task.projectanalysis.issue.ScmAccountToUserLoader; +import org.sonar.server.computation.task.projectanalysis.issue.TrackerBaseInputFactory; +import org.sonar.server.computation.task.projectanalysis.issue.TrackerExecution; +import org.sonar.server.computation.task.projectanalysis.issue.TrackerRawInputFactory; +import org.sonar.server.computation.task.projectanalysis.issue.UpdateConflictResolver; +import org.sonar.server.computation.task.projectanalysis.issue.commonrule.BranchCoverageRule; +import org.sonar.server.computation.task.projectanalysis.issue.commonrule.CommentDensityRule; +import org.sonar.server.computation.task.projectanalysis.issue.commonrule.CommonRuleEngineImpl; +import org.sonar.server.computation.task.projectanalysis.issue.commonrule.DuplicatedBlockRule; +import org.sonar.server.computation.task.projectanalysis.issue.commonrule.LineCoverageRule; +import org.sonar.server.computation.task.projectanalysis.issue.commonrule.SkippedTestRule; +import org.sonar.server.computation.task.projectanalysis.issue.commonrule.TestErrorRule; +import org.sonar.server.computation.task.projectanalysis.issue.filter.IssueFilter; +import org.sonar.server.computation.task.projectanalysis.language.LanguageRepositoryImpl; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureComputersHolderImpl; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureComputersVisitor; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryImpl; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureToMeasureDto; +import org.sonar.server.computation.task.projectanalysis.metric.MetricModule; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolderImpl; +import org.sonar.server.computation.task.projectanalysis.api.posttask.PostProjectAnalysisTasksExecutor; +import org.sonar.server.computation.task.projectanalysis.qualitygate.EvaluationResultTextConverterImpl; +import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateHolderImpl; +import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateServiceImpl; +import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateStatusHolderImpl; +import org.sonar.server.computation.task.projectanalysis.qualitymodel.NewQualityModelMeasuresVisitor; +import org.sonar.server.computation.task.projectanalysis.qualitymodel.QualityModelMeasuresVisitor; +import org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingSettings; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolderImpl; +import org.sonar.server.computation.task.projectanalysis.scm.ScmInfoRepositoryImpl; +import org.sonar.server.computation.task.projectanalysis.source.LastCommitVisitor; +import org.sonar.server.computation.task.projectanalysis.source.SourceHashRepositoryImpl; +import org.sonar.server.computation.task.projectanalysis.source.SourceLinesRepositoryImpl; +import org.sonar.server.computation.task.step.ComputationStepExecutor; +import org.sonar.server.computation.task.step.ComputationSteps; +import org.sonar.server.computation.task.projectanalysis.step.ReportComputationSteps; +import org.sonar.server.computation.taskprocessor.MutableTaskResultHolderImpl; +import org.sonar.server.view.index.ViewIndex; + +public final class ProjectAnalysisTaskContainerPopulator implements ContainerPopulator { + private static final ReportAnalysisComponentProvider[] NO_REPORT_ANALYSIS_COMPONENT_PROVIDERS = new ReportAnalysisComponentProvider[0]; + + private final CeTask task; + private final ReportAnalysisComponentProvider[] componentProviders; + + public ProjectAnalysisTaskContainerPopulator(CeTask task, @Nullable ReportAnalysisComponentProvider[] componentProviders) { + this.task = task; + this.componentProviders = componentProviders == null ? NO_REPORT_ANALYSIS_COMPONENT_PROVIDERS : componentProviders; + } + + @Override + public void populateContainer(TaskContainer container) { + ComputationSteps steps = new ReportComputationSteps(container); + container.add(SettingsLoader.class); + container.add(task); + container.add(steps); + container.addSingletons(componentClasses()); + for (ReportAnalysisComponentProvider componentProvider : componentProviders) { + container.addSingletons(componentProvider.getComponents()); + } + container.addSingletons(steps.orderedStepClasses()); + } + + /** + * List of all objects to be injected in the picocontainer dedicated to computation stack. + * Does not contain the steps declared in {@link ReportComputationSteps#orderedStepClasses()}. + */ + private static List componentClasses() { + return Arrays.asList( + PostProjectAnalysisTasksExecutor.class, + ComputationStepExecutor.class, + + // File System + new ComputationTempFolderProvider(), + + MetricModule.class, + + // holders + AnalysisMetadataHolderImpl.class, + CrossProjectDuplicationStatusHolderImpl.class, + BatchReportDirectoryHolderImpl.class, + TreeRootHolderImpl.class, + PeriodsHolderImpl.class, + QualityGateHolderImpl.class, + QualityGateStatusHolderImpl.class, + RatingSettings.class, + ActiveRulesHolderImpl.class, + MeasureComputersHolderImpl.class, + MutableTaskResultHolderImpl.class, + + BatchReportReaderImpl.class, + + // repositories + LanguageRepositoryImpl.class, + MeasureRepositoryImpl.class, + EventRepositoryImpl.class, + SettingsRepositoryImpl.class, + DbIdsRepositoryImpl.class, + DisabledComponentsHolderImpl.class, + QualityGateServiceImpl.class, + EvaluationResultTextConverterImpl.class, + SourceLinesRepositoryImpl.class, + SourceHashRepositoryImpl.class, + ScmInfoRepositoryImpl.class, + DuplicationRepositoryImpl.class, + + // issues + RuleRepositoryImpl.class, + ScmAccountToUserLoader.class, + ScmAccountToUser.class, + IssueCache.class, + DefaultAssignee.class, + IssueVisitors.class, + IssueLifecycle.class, + ComponentsWithUnprocessedIssues.class, + ComponentIssuesRepositoryImpl.class, + IssueFilter.class, + + // common rules + CommonRuleEngineImpl.class, + BranchCoverageRule.class, + LineCoverageRule.class, + CommentDensityRule.class, + DuplicatedBlockRule.class, + TestErrorRule.class, + SkippedTestRule.class, + + // order is important: RuleTypeCopier must be the first one. And DebtAggregator must be before NewDebtAggregator (new debt requires + // debt) + RuleTypeCopier.class, + RuleTagsCopier.class, + DebtCalculator.class, + EffortAggregator.class, + NewEffortCalculator.class, + NewEffortAggregator.class, + IssueAssigner.class, + IssueCounter.class, + MovedIssueVisitor.class, + + // visitors : order is important, measure computers must be executed at the end in order to access to every measures / issues + LoadComponentUuidsHavingOpenIssuesVisitor.class, + IntegrateIssuesVisitor.class, + CloseIssuesOnRemovedComponentsVisitor.class, + QualityModelMeasuresVisitor.class, + NewQualityModelMeasuresVisitor.class, + LastCommitVisitor.class, + MeasureComputersVisitor.class, + + UpdateConflictResolver.class, + TrackerBaseInputFactory.class, + TrackerRawInputFactory.class, + Tracker.class, + TrackerExecution.class, + BaseIssuesLoader.class, + + // filemove + SourceSimilarityImpl.class, + FileSimilarityImpl.class, + MutableMovedFilesRepositoryImpl.class, + + // duplication + IntegrateCrossProjectDuplications.class, + + // views + ViewIndex.class, + + MeasureToMeasureDto.class); + } + +} diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/package-info.java new file mode 100644 index 00000000000..833fc38c587 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.container; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/AbstractDuplicate.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/AbstractDuplicate.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/duplication/AbstractDuplicate.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/AbstractDuplicate.java index 8496e3ecf4f..87bd18e190b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/AbstractDuplicate.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/AbstractDuplicate.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/CrossProjectDuplicate.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicate.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/duplication/CrossProjectDuplicate.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicate.java index 1e78f8c15cd..efeb690877b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/CrossProjectDuplicate.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicate.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import java.util.Objects; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/CrossProjectDuplicationStatusHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolder.java similarity index 89% rename from server/sonar-server/src/main/java/org/sonar/server/computation/duplication/CrossProjectDuplicationStatusHolder.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolder.java index 09c9381d737..284dc843d4f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/CrossProjectDuplicationStatusHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolder.java @@ -17,9 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; /** * A simple holder to know if the cross project duplication should be computed or not. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/CrossProjectDuplicationStatusHolderImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImpl.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/duplication/CrossProjectDuplicationStatusHolderImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImpl.java index 97192fb7b1b..da236687cbe 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/CrossProjectDuplicationStatusHolderImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImpl.java @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import com.google.common.base.Preconditions; import javax.annotation.CheckForNull; import org.picocontainer.Startable; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; public class CrossProjectDuplicationStatusHolderImpl implements CrossProjectDuplicationStatusHolder, Startable { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/DetailedTextBlock.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DetailedTextBlock.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/duplication/DetailedTextBlock.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DetailedTextBlock.java index 3e6badd299c..49b1ad05440 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/DetailedTextBlock.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DetailedTextBlock.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import java.util.Objects; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/Duplicate.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplicate.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/computation/duplication/Duplicate.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplicate.java index 1e3c398c054..3a197d22e85 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/Duplicate.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplicate.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; public interface Duplicate { TextBlock getTextBlock(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/Duplication.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplication.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/duplication/Duplication.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplication.java index e535082bbdc..9af07584cba 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/Duplication.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplication.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import com.google.common.base.Function; import com.google.common.base.Predicate; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/DuplicationRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepository.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/duplication/DuplicationRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepository.java index 95c9b22828a..44771257f3c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/DuplicationRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepository.java @@ -17,9 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; /** * Repository of code duplications in files of the project. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/DuplicationRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImpl.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/duplication/DuplicationRepositoryImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImpl.java index ecfee678565..72c6500094b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/DuplicationRepositoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImpl.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import java.util.Collection; import java.util.Collections; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/InProjectDuplicate.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicate.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/duplication/InProjectDuplicate.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicate.java index 40d083aedcf..39006ff8751 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/InProjectDuplicate.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicate.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import java.util.Objects; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/InnerDuplicate.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicate.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/computation/duplication/InnerDuplicate.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicate.java index e25f4433292..cb2b4f71a6b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/InnerDuplicate.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicate.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import javax.annotation.concurrent.Immutable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/IntegrateCrossProjectDuplications.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplications.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/duplication/IntegrateCrossProjectDuplications.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplications.java index e23b37858ce..2ddbaba2936 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/IntegrateCrossProjectDuplications.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplications.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -36,7 +36,7 @@ import org.sonar.duplications.index.CloneGroup; import org.sonar.duplications.index.CloneIndex; import org.sonar.duplications.index.ClonePart; import org.sonar.duplications.index.PackedMemoryCloneIndex; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static com.google.common.collect.FluentIterable.from; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/TextBlock.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlock.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/duplication/TextBlock.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlock.java index d7ce6a8a71b..41030cc9f89 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/duplication/TextBlock.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlock.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import java.util.Objects; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/package-info.java new file mode 100644 index 00000000000..6c81f5cc192 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.duplication; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/event/Event.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/Event.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/event/Event.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/Event.java index e53efd2e924..036ef2b2516 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/event/Event.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/Event.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.event; +package org.sonar.server.computation.task.projectanalysis.event; import java.util.Objects; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/event/EventRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepository.java similarity index 84% rename from server/sonar-server/src/main/java/org/sonar/server/computation/event/EventRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepository.java index 282c8bebda2..8ae6e202cba 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/event/EventRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepository.java @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.event; +package org.sonar.server.computation.task.projectanalysis.event; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; -import static org.sonar.server.computation.component.Component.Type; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type; public interface EventRepository { /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/event/EventRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImpl.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/event/EventRepositoryImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImpl.java index 4f7ebba0c17..14a27054513 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/event/EventRepositoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImpl.java @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.event; +package org.sonar.server.computation.task.projectanalysis.event; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/qualitygatedetails/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/package-info.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/qualitygatedetails/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/package-info.java index 78fab04457a..0ebd0662ecc 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/qualitygatedetails/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/event/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.computation.measure.qualitygatedetails; +package org.sonar.server.computation.task.projectanalysis.event; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/FileMoveDetectionStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStep.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/computation/filemove/FileMoveDetectionStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStep.java index a1d28d70789..75328dcd0ce 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/FileMoveDetectionStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.filemove; +package org.sonar.server.computation.task.projectanalysis.filemove; import com.google.common.base.Splitter; import com.google.common.collect.ArrayListMultimap; @@ -43,22 +43,22 @@ import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.component.ComponentTreeQuery; import org.sonar.db.source.FileSourceDto; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; -import org.sonar.server.computation.filemove.FileSimilarity.File; -import org.sonar.server.computation.analysis.Analysis; -import org.sonar.server.computation.source.SourceLinesRepository; -import org.sonar.server.computation.step.ComputationStep; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.filemove.FileSimilarity.File; +import org.sonar.server.computation.task.projectanalysis.analysis.Analysis; +import org.sonar.server.computation.task.projectanalysis.source.SourceLinesRepository; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.base.Splitter.on; import static com.google.common.collect.FluentIterable.from; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; public class FileMoveDetectionStep implements ComputationStep { protected static final int MIN_REQUIRED_SCORE = 85; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/FileSimilarity.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarity.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/filemove/FileSimilarity.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarity.java index db137494f5f..dca7446db52 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/FileSimilarity.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarity.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.filemove; +package org.sonar.server.computation.task.projectanalysis.filemove; import java.util.List; import javax.annotation.CheckForNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/FileSimilarityImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarityImpl.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/filemove/FileSimilarityImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarityImpl.java index bf30897d490..fa9b75b001a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/FileSimilarityImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarityImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.filemove; +package org.sonar.server.computation.task.projectanalysis.filemove; import java.util.List; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/Match.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/Match.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/filemove/Match.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/Match.java index 9d050597b4a..6f0bc2c9726 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/Match.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/Match.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.filemove; +package org.sonar.server.computation.task.projectanalysis.filemove; import java.util.Objects; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/MatchesByScore.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScore.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/computation/filemove/MatchesByScore.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScore.java index 3de15f135c1..88e1ef1fd04 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/MatchesByScore.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScore.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.filemove; +package org.sonar.server.computation.task.projectanalysis.filemove; import java.util.ArrayList; import java.util.Arrays; @@ -25,7 +25,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import static org.sonar.server.computation.filemove.FileMoveDetectionStep.MIN_REQUIRED_SCORE; +import static org.sonar.server.computation.task.projectanalysis.filemove.FileMoveDetectionStep.MIN_REQUIRED_SCORE; abstract class MatchesByScore implements Iterable> { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/MovedFilesRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MovedFilesRepository.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/computation/filemove/MovedFilesRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MovedFilesRepository.java index 3511054cdbd..7225a7c7a78 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/MovedFilesRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MovedFilesRepository.java @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.filemove; +package org.sonar.server.computation.task.projectanalysis.filemove; import com.google.common.base.Optional; import javax.annotation.Nullable; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/MutableMovedFilesRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepository.java similarity index 84% rename from server/sonar-server/src/main/java/org/sonar/server/computation/filemove/MutableMovedFilesRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepository.java index 0eee9fa4e22..8880c516320 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/MutableMovedFilesRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepository.java @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.filemove; +package org.sonar.server.computation.task.projectanalysis.filemove; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; -import static org.sonar.server.computation.component.Component.Type; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type; public interface MutableMovedFilesRepository extends MovedFilesRepository { /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/MutableMovedFilesRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImpl.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/filemove/MutableMovedFilesRepositoryImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImpl.java index 03a659d8653..01bcc2981f1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/MutableMovedFilesRepositoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImpl.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.filemove; +package org.sonar.server.computation.task.projectanalysis.filemove; import com.google.common.base.Optional; import java.util.HashMap; import java.util.Map; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/ScoreMatrix.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrix.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/filemove/ScoreMatrix.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrix.java index 50da95f4834..6c6c240c031 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/ScoreMatrix.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrix.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.filemove; +package org.sonar.server.computation.task.projectanalysis.filemove; import java.util.Map; import java.util.Objects; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/SourceSimilarity.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarity.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/computation/filemove/SourceSimilarity.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarity.java index 8df26813b01..7050850427f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/SourceSimilarity.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarity.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.filemove; +package org.sonar.server.computation.task.projectanalysis.filemove; import java.util.List; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/SourceSimilarityImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImpl.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/filemove/SourceSimilarityImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImpl.java index 2eb325dfd61..b3b37b7d9ce 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/filemove/SourceSimilarityImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.filemove; +package org.sonar.server.computation.task.projectanalysis.filemove; import java.util.List; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/package-info.java new file mode 100644 index 00000000000..6878fe14fa1 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/package-info.java @@ -0,0 +1,24 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.filemove; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/filesystem/ComputationTempFolderProvider.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/ComputationTempFolderProvider.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/filesystem/ComputationTempFolderProvider.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/ComputationTempFolderProvider.java index 17090790e94..c4425c0b43a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/filesystem/ComputationTempFolderProvider.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/ComputationTempFolderProvider.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.filesystem; +package org.sonar.server.computation.task.projectanalysis.filesystem; import java.io.File; import java.io.IOException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/package-info.java new file mode 100644 index 00000000000..7b8e54c6e35 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.filesystem; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/AverageFormula.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormula.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/AverageFormula.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormula.java index b644c58fe3c..585b1be9a4e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/AverageFormula.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormula.java @@ -17,10 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula; +package org.sonar.server.computation.task.projectanalysis.formula; import com.google.common.base.Optional; -import org.sonar.server.computation.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/Counter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Counter.java similarity index 90% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/Counter.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Counter.java index d093a73d7f6..bce32420628 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/Counter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Counter.java @@ -17,9 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula; +package org.sonar.server.computation.task.projectanalysis.formula; -import static org.sonar.server.computation.component.Component.Type; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type; /** * A counter is used to aggregate some data diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/CounterInitializationContext.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CounterInitializationContext.java similarity index 83% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/CounterInitializationContext.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CounterInitializationContext.java index ae8b8075588..adfa0c46c17 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/CounterInitializationContext.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CounterInitializationContext.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula; +package org.sonar.server.computation.task.projectanalysis.formula; import com.google.common.base.Optional; import java.util.List; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.period.Period; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.period.Period; /** * The context passing information to {@link Counter#initialize(CounterInitializationContext)}. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/CreateMeasureContext.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CreateMeasureContext.java similarity index 82% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/CreateMeasureContext.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CreateMeasureContext.java index a035baf3e81..ce35eb382c2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/CreateMeasureContext.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CreateMeasureContext.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula; +package org.sonar.server.computation.task.projectanalysis.formula; import java.util.List; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.period.Period; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.period.Period; /** * Context passing information to implementation of {@link Formula#createMeasure(Counter, CreateMeasureContext)} method. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/DistributionFormula.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormula.java similarity index 90% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/DistributionFormula.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormula.java index c748ea9af9e..5aaeda05350 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/DistributionFormula.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormula.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula; +package org.sonar.server.computation.task.projectanalysis.formula; import com.google.common.base.Optional; import org.sonar.api.ce.measure.RangeDistributionBuilder; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/Formula.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Formula.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/Formula.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Formula.java index 51208ecba62..fae98b21913 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/Formula.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Formula.java @@ -17,10 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula; +package org.sonar.server.computation.task.projectanalysis.formula; import com.google.common.base.Optional; -import org.sonar.server.computation.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; /** * A formula is used to aggregated data on all nodes of a component tree diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/FormulaExecutorComponentVisitor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/FormulaExecutorComponentVisitor.java similarity index 90% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/FormulaExecutorComponentVisitor.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/FormulaExecutorComponentVisitor.java index 75273d9636c..9498c9d9d64 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/FormulaExecutorComponentVisitor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/FormulaExecutorComponentVisitor.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula; +package org.sonar.server.computation.task.projectanalysis.formula; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; @@ -25,16 +25,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import javax.annotation.CheckForNull; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ComponentVisitor; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.PathAwareVisitorAdapter; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/SumFormula.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormula.java similarity index 88% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/SumFormula.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormula.java index 67d2da19c01..20af33e0960 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/SumFormula.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormula.java @@ -17,16 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula; +package org.sonar.server.computation.task.projectanalysis.formula; import com.google.common.base.Optional; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.formula.counter.IntSumCounter; -import org.sonar.server.computation.formula.counter.LongSumCounter; -import org.sonar.server.computation.formula.counter.SumCounter; -import org.sonar.server.computation.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.formula.counter.IntSumCounter; +import org.sonar.server.computation.task.projectanalysis.formula.counter.LongSumCounter; +import org.sonar.server.computation.task.projectanalysis.formula.counter.SumCounter; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/VariationSumFormula.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/VariationSumFormula.java similarity index 89% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/VariationSumFormula.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/VariationSumFormula.java index 9f95f756cc9..4270f7e41e4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/VariationSumFormula.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/VariationSumFormula.java @@ -17,21 +17,21 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula; +package org.sonar.server.computation.task.projectanalysis.formula; import com.google.common.base.Optional; import com.google.common.base.Predicate; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.formula.counter.DoubleVariationValue; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.period.Period; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.formula.counter.DoubleVariationValue; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.period.Period; import static com.google.common.collect.FluentIterable.from; import static java.util.Objects.requireNonNull; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; /** * A Formula which aggregates variations of a specific metric by simply making the sums of its variations. It supports diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/DoubleVariationValue.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleVariationValue.java similarity index 88% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/DoubleVariationValue.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleVariationValue.java index 8a23fecc3da..ad8f07dd078 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/DoubleVariationValue.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleVariationValue.java @@ -17,16 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.counter; +package org.sonar.server.computation.task.projectanalysis.formula.counter; import com.google.common.base.Optional; import javax.annotation.Nullable; -import org.sonar.server.computation.formula.Counter; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.formula.Counter; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; -import static org.sonar.server.computation.period.PeriodsHolder.MAX_NUMBER_OF_PERIODS; +import static org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder.MAX_NUMBER_OF_PERIODS; /** * Convenience class wrapping a double to compute the value of a MeasureVariation as an double and know it is has ever diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/IntSumCounter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounter.java similarity index 90% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/IntSumCounter.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounter.java index 43ee1bddd0e..c550b0db136 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/IntSumCounter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounter.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.counter; +package org.sonar.server.computation.task.projectanalysis.formula.counter; import com.google.common.base.Optional; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import org.sonar.server.computation.formula.CounterInitializationContext; -import org.sonar.server.computation.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/IntVariationValue.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntVariationValue.java similarity index 88% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/IntVariationValue.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntVariationValue.java index be04079d254..4c1f92c6701 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/IntVariationValue.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntVariationValue.java @@ -17,16 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.counter; +package org.sonar.server.computation.task.projectanalysis.formula.counter; import com.google.common.base.Optional; import javax.annotation.Nullable; -import org.sonar.server.computation.formula.Counter; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.formula.Counter; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; -import static org.sonar.server.computation.period.PeriodsHolder.MAX_NUMBER_OF_PERIODS; +import static org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder.MAX_NUMBER_OF_PERIODS; /** * Convenience class wrapping a int to compute the value of a MeasureVariation as an int and know it is has ever been diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/LongSumCounter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounter.java similarity index 90% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/LongSumCounter.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounter.java index 4f275058143..ce65bf999db 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/LongSumCounter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounter.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.counter; +package org.sonar.server.computation.task.projectanalysis.formula.counter; import com.google.common.base.Optional; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import org.sonar.server.computation.formula.CounterInitializationContext; -import org.sonar.server.computation.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/LongVariationValue.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongVariationValue.java similarity index 88% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/LongVariationValue.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongVariationValue.java index 620eaf367d8..a53f1e37d0c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/LongVariationValue.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongVariationValue.java @@ -17,16 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.counter; +package org.sonar.server.computation.task.projectanalysis.formula.counter; import com.google.common.base.Optional; import javax.annotation.Nullable; -import org.sonar.server.computation.formula.Counter; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.formula.Counter; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; -import static org.sonar.server.computation.period.PeriodsHolder.MAX_NUMBER_OF_PERIODS; +import static org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder.MAX_NUMBER_OF_PERIODS; /** * Convenience class wrapping a long to compute the value of a MeasureVariation as an long and know it is has ever been diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/SumCounter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/SumCounter.java similarity index 87% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/SumCounter.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/SumCounter.java index 9d9b2d3eac8..ece712ef184 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/SumCounter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/SumCounter.java @@ -17,10 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.counter; +package org.sonar.server.computation.task.projectanalysis.formula.counter; import com.google.common.base.Optional; -import org.sonar.server.computation.formula.Counter; +import org.sonar.server.computation.task.projectanalysis.formula.Counter; public interface SumCounter> extends Counter { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/package-info.java new file mode 100644 index 00000000000..91f3ae42c55 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.formula.counter; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/CoverageFormula.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageFormula.java similarity index 72% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/CoverageFormula.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageFormula.java index a6e047f90c3..5af17352f63 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/CoverageFormula.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageFormula.java @@ -17,16 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.coverage; +package org.sonar.server.computation.task.projectanalysis.formula.coverage; import com.google.common.base.Optional; -import org.sonar.server.computation.formula.Counter; -import org.sonar.server.computation.formula.CreateMeasureContext; -import org.sonar.server.computation.formula.Formula; -import org.sonar.server.computation.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.formula.Counter; +import org.sonar.server.computation.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.server.computation.task.projectanalysis.formula.Formula; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; -import static org.sonar.server.computation.formula.coverage.CoverageUtils.calculateCoverage; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.formula.coverage.CoverageUtils.calculateCoverage; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; /** * An abstract {@link Formula} which implements the aggregation of a {@link Counter} of diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/CoverageUtils.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtils.java similarity index 81% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/CoverageUtils.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtils.java index 918f687c64a..2b125a11c22 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/CoverageUtils.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtils.java @@ -17,19 +17,19 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.coverage; +package org.sonar.server.computation.task.projectanalysis.formula.coverage; import com.google.common.base.Optional; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.formula.CounterInitializationContext; -import org.sonar.server.computation.formula.CreateMeasureContext; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.period.Period; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.server.computation.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.period.Period; import static com.google.common.collect.FluentIterable.from; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.period.PeriodPredicates.viewsRestrictedPeriods; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.period.PeriodPredicates.viewsRestrictedPeriods; public final class CoverageUtils { private static final Measure DEFAULT_MEASURE = newMeasureBuilder().create(0L); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/CoverageVariationFormula.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageVariationFormula.java similarity index 70% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/CoverageVariationFormula.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageVariationFormula.java index 8809b8e06b7..659cd3a5461 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/CoverageVariationFormula.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageVariationFormula.java @@ -17,19 +17,19 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.coverage; +package org.sonar.server.computation.task.projectanalysis.formula.coverage; import com.google.common.base.Optional; -import org.sonar.server.computation.formula.CreateMeasureContext; -import org.sonar.server.computation.formula.Formula; -import org.sonar.server.computation.formula.counter.LongVariationValue; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.period.Period; +import org.sonar.server.computation.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.server.computation.task.projectanalysis.formula.Formula; +import org.sonar.server.computation.task.projectanalysis.formula.counter.LongVariationValue; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.period.Period; -import static org.sonar.server.computation.formula.coverage.CoverageUtils.calculateCoverage; -import static org.sonar.server.computation.formula.coverage.CoverageUtils.supportedPeriods; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.formula.coverage.CoverageUtils.calculateCoverage; +import static org.sonar.server.computation.task.projectanalysis.formula.coverage.CoverageUtils.supportedPeriods; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; /** * An abstract Formula which implements the aggregation of a Counter of type ElementsAndCoveredElementsVariationCounter diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/ElementsAndCoveredElementsCounter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsCounter.java similarity index 84% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/ElementsAndCoveredElementsCounter.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsCounter.java index 7e561c30416..8bbc7471c54 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/ElementsAndCoveredElementsCounter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsCounter.java @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.coverage; +package org.sonar.server.computation.task.projectanalysis.formula.coverage; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.formula.Counter; -import org.sonar.server.computation.formula.CounterInitializationContext; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.formula.Counter; +import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; /** * A counter used to create a measure which are based on a count of elements and coveredElements. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/ElementsAndCoveredElementsVariationCounter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsVariationCounter.java similarity index 81% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/ElementsAndCoveredElementsVariationCounter.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsVariationCounter.java index 66b076a1401..4ecd3fcedb3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/ElementsAndCoveredElementsVariationCounter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsVariationCounter.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.coverage; +package org.sonar.server.computation.task.projectanalysis.formula.coverage; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.formula.Counter; -import org.sonar.server.computation.formula.CounterInitializationContext; -import org.sonar.server.computation.formula.counter.LongVariationValue; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.formula.Counter; +import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.server.computation.task.projectanalysis.formula.counter.LongVariationValue; /** * A counter used to create measure variations which are based on a count of elements and coveredElements. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredCounter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredCounter.java similarity index 84% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredCounter.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredCounter.java index 0ad08de1c55..a63dd088776 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredCounter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredCounter.java @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.coverage; +package org.sonar.server.computation.task.projectanalysis.formula.coverage; -import org.sonar.server.computation.formula.CounterInitializationContext; +import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; -import static org.sonar.server.computation.formula.coverage.CoverageUtils.getLongMeasureValue; +import static org.sonar.server.computation.task.projectanalysis.formula.coverage.CoverageUtils.getLongMeasureValue; public final class LinesAndConditionsWithUncoveredCounter extends ElementsAndCoveredElementsCounter { private final LinesAndConditionsWithUncoveredMetricKeys metricKeys; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredFormula.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredFormula.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredFormula.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredFormula.java index c1b23844ae7..aa7ee7492a9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredFormula.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredFormula.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.coverage; +package org.sonar.server.computation.task.projectanalysis.formula.coverage; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredMetricKeys.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredMetricKeys.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredMetricKeys.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredMetricKeys.java index d831f064297..2fd619e4cfd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredMetricKeys.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredMetricKeys.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.coverage; +package org.sonar.server.computation.task.projectanalysis.formula.coverage; import javax.annotation.concurrent.Immutable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java similarity index 79% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java index a55bc6b6302..2fc02e9e664 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java @@ -17,16 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.coverage; +package org.sonar.server.computation.task.projectanalysis.formula.coverage; import com.google.common.base.Optional; -import org.sonar.server.computation.formula.CounterInitializationContext; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.period.Period; +import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.period.Period; -import static org.sonar.server.computation.formula.coverage.CoverageUtils.getLongVariation; -import static org.sonar.server.computation.formula.coverage.CoverageUtils.supportedPeriods; +import static org.sonar.server.computation.task.projectanalysis.formula.coverage.CoverageUtils.getLongVariation; +import static org.sonar.server.computation.task.projectanalysis.formula.coverage.CoverageUtils.supportedPeriods; public final class LinesAndConditionsWithUncoveredVariationCounter extends ElementsAndCoveredElementsVariationCounter { private final LinesAndConditionsWithUncoveredMetricKeys metricKeys; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredVariationFormula.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationFormula.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredVariationFormula.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationFormula.java index 3dfdbec95ad..690619ac846 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredVariationFormula.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationFormula.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.coverage; +package org.sonar.server.computation.task.projectanalysis.formula.coverage; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredCounter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredCounter.java similarity index 83% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredCounter.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredCounter.java index 83911b42b05..e2a09d179f0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredCounter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredCounter.java @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.coverage; +package org.sonar.server.computation.task.projectanalysis.formula.coverage; -import org.sonar.server.computation.formula.CounterInitializationContext; +import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; -import static org.sonar.server.computation.formula.coverage.CoverageUtils.getLongMeasureValue; +import static org.sonar.server.computation.task.projectanalysis.formula.coverage.CoverageUtils.getLongMeasureValue; public final class SingleWithUncoveredCounter extends ElementsAndCoveredElementsCounter { private final SingleWithUncoveredMetricKeys metricKeys; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredFormula.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredFormula.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredFormula.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredFormula.java index 15e74eaa715..04b6a9b3dd4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredFormula.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredFormula.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.coverage; +package org.sonar.server.computation.task.projectanalysis.formula.coverage; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredMetricKeys.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredMetricKeys.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredMetricKeys.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredMetricKeys.java index 291b04ac75f..e4896376664 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredMetricKeys.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredMetricKeys.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.coverage; +package org.sonar.server.computation.task.projectanalysis.formula.coverage; import javax.annotation.concurrent.Immutable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredVariationCounter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationCounter.java similarity index 72% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredVariationCounter.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationCounter.java index 01bc84c8e52..d948b03824b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredVariationCounter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationCounter.java @@ -17,16 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.coverage; +package org.sonar.server.computation.task.projectanalysis.formula.coverage; -import org.sonar.server.computation.formula.CounterInitializationContext; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.period.Period; +import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.period.Period; import static java.util.Objects.requireNonNull; -import static org.sonar.server.computation.formula.coverage.CoverageUtils.getLongVariation; -import static org.sonar.server.computation.formula.coverage.CoverageUtils.getMeasureVariations; -import static org.sonar.server.computation.formula.coverage.CoverageUtils.supportedPeriods; +import static org.sonar.server.computation.task.projectanalysis.formula.coverage.CoverageUtils.getLongVariation; +import static org.sonar.server.computation.task.projectanalysis.formula.coverage.CoverageUtils.getMeasureVariations; +import static org.sonar.server.computation.task.projectanalysis.formula.coverage.CoverageUtils.supportedPeriods; public final class SingleWithUncoveredVariationCounter extends ElementsAndCoveredElementsVariationCounter { private final SingleWithUncoveredMetricKeys metricKeys; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredVariationFormula.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationFormula.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredVariationFormula.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationFormula.java index e8fa4f518e0..cb91692bd73 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredVariationFormula.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationFormula.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.coverage; +package org.sonar.server.computation.task.projectanalysis.formula.coverage; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/package-info.java new file mode 100644 index 00000000000..02fbcd0bedc --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.formula.coverage; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/package-info.java new file mode 100644 index 00000000000..59ea8f47395 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.formula; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/BaseIssuesLoader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/BaseIssuesLoader.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/BaseIssuesLoader.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/BaseIssuesLoader.java index 26f51039c37..464167665e4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/BaseIssuesLoader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/BaseIssuesLoader.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.util.ArrayList; import java.util.List; @@ -32,8 +32,8 @@ import org.sonar.db.DbSession; import org.sonar.db.MyBatis; import org.sonar.db.issue.IssueDto; import org.sonar.db.issue.IssueMapper; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.qualityprofile.ActiveRulesHolder; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolder; /** * Loads all the project open issues from database, including manual issues. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/CloseIssuesOnRemovedComponentsVisitor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitor.java similarity index 85% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/CloseIssuesOnRemovedComponentsVisitor.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitor.java index 8633d8d71e9..b76c9f2fe4d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/CloseIssuesOnRemovedComponentsVisitor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitor.java @@ -17,17 +17,17 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.util.List; import java.util.Set; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; import org.sonar.server.util.cache.DiskCache; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; /** * Close issues on removed components diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/ComponentIssuesRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepository.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/ComponentIssuesRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepository.java index d5c20bdc475..a2c18c91173 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/ComponentIssuesRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepository.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.util.List; import org.sonar.api.ce.measure.MeasureComputer; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; /** * This repository contains issues for only one component at a time. It's populated by {@link IntegrateIssuesVisitor} and diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/ComponentIssuesRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImpl.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/ComponentIssuesRepositoryImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImpl.java index 321c7d2e01d..6cbfd54ca51 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/ComponentIssuesRepositoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImpl.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.util.List; import javax.annotation.CheckForNull; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/ComponentsWithUnprocessedIssues.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssues.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/ComponentsWithUnprocessedIssues.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssues.java index 0f0830468c9..3ea24dc55fb 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/ComponentsWithUnprocessedIssues.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssues.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.util.Set; import javax.annotation.CheckForNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/DebtCalculator.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculator.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/DebtCalculator.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculator.java index 613da8894f1..322376c2fbc 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/DebtCalculator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculator.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.base.MoreObjects; import com.google.common.base.Strings; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/DefaultAssignee.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssignee.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/DefaultAssignee.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssignee.java index 3251c06d10b..f809f2abccc 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/DefaultAssignee.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssignee.java @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.base.Strings; import javax.annotation.CheckForNull; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.server.computation.component.SettingsRepository; -import org.sonar.server.computation.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.SettingsRepository; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; import org.sonar.server.user.index.UserDoc; import org.sonar.server.user.index.UserIndex; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/EffortAggregator.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregator.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/EffortAggregator.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregator.java index 33ca60529fd..30dc6268477 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/EffortAggregator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregator.java @@ -17,17 +17,17 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.util.HashMap; import java.util.Map; import org.sonar.api.measures.CoreMetrics; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; import static org.sonar.api.measures.CoreMetrics.RELIABILITY_REMEDIATION_EFFORT_KEY; import static org.sonar.api.measures.CoreMetrics.SECURITY_REMEDIATION_EFFORT_KEY; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IntegrateIssuesVisitor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitor.java similarity index 90% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/IntegrateIssuesVisitor.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitor.java index 82e75c69ecc..19f3e843077 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IntegrateIssuesVisitor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitor.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.base.Optional; import java.util.ArrayList; @@ -25,13 +25,13 @@ import java.util.List; import java.util.Map; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.tracking.Tracking; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; -import org.sonar.server.computation.filemove.MovedFilesRepository; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.filemove.MovedFilesRepository; import org.sonar.server.util.cache.DiskCache; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; public class IntegrateIssuesVisitor extends TypeAwareVisitorAdapter { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueAssigner.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssigner.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueAssigner.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssigner.java index 9dfc1395b6c..749e8508327 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueAssigner.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssigner.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.base.Optional; import com.google.common.base.Strings; @@ -28,10 +28,10 @@ import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.IssueChangeContext; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.scm.ScmInfo; -import org.sonar.server.computation.scm.ScmInfoRepository; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.scm.ScmInfo; +import org.sonar.server.computation.task.projectanalysis.scm.ScmInfoRepository; import org.sonar.server.issue.IssueUpdater; import static org.apache.commons.lang.StringUtils.defaultIfEmpty; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueCache.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCache.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueCache.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCache.java index ddba5b7b8e9..d0ed2fd6ca2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueCache.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCache.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.io.File; import java.io.IOException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueCounter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounter.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueCounter.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounter.java index fa95b9efc83..3bf49cab4c7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueCounter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounter.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.collect.EnumMultiset; import com.google.common.collect.HashMultiset; @@ -29,14 +29,14 @@ import javax.annotation.Nullable; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rules.RuleType; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; import static org.sonar.api.issue.Issue.RESOLUTION_FALSE_POSITIVE; import static org.sonar.api.issue.Issue.RESOLUTION_WONT_FIX; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueLifecycle.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycle.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueLifecycle.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycle.java index 40f2f105bbb..32be9da4747 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueLifecycle.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycle.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.annotations.VisibleForTesting; import java.util.Date; @@ -25,7 +25,7 @@ import org.sonar.api.issue.Issue; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.IssueChangeContext; import org.sonar.core.util.Uuids; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; import org.sonar.server.issue.IssueUpdater; import org.sonar.server.issue.workflow.IssueWorkflow; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueVisitor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitor.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueVisitor.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitor.java index b1ce918d80b..efd5d192e30 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueVisitor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitor.java @@ -17,10 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; public abstract class IssueVisitor { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueVisitors.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitors.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueVisitors.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitors.java index 1585bc11c92..508961b24d2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueVisitors.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitors.java @@ -17,10 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; public class IssueVisitors { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/LoadComponentUuidsHavingOpenIssuesVisitor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitor.java similarity index 79% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/LoadComponentUuidsHavingOpenIssuesVisitor.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitor.java index 691f3bbb6ad..9204eac9087 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/LoadComponentUuidsHavingOpenIssuesVisitor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitor.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; /** * Load all open components having open issues of the project diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/MovedIssueVisitor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitor.java similarity index 87% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/MovedIssueVisitor.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitor.java index 2e5ababa879..68fde5d1c45 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/MovedIssueVisitor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitor.java @@ -17,16 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.base.Optional; import java.util.Date; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.IssueChangeContext; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.filemove.MovedFilesRepository; -import org.sonar.server.computation.filemove.MovedFilesRepository.OriginalFile; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.filemove.MovedFilesRepository; +import org.sonar.server.computation.task.projectanalysis.filemove.MovedFilesRepository.OriginalFile; import org.sonar.server.issue.IssueUpdater; import static com.google.common.base.Preconditions.checkState; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/MutableComponentIssuesRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MutableComponentIssuesRepository.java similarity index 89% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/MutableComponentIssuesRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MutableComponentIssuesRepository.java index 342f8655dba..e1d11e94f88 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/MutableComponentIssuesRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MutableComponentIssuesRepository.java @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.util.List; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; public interface MutableComponentIssuesRepository extends ComponentIssuesRepository { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewEffortAggregator.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregator.java similarity index 90% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewEffortAggregator.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregator.java index a631eb30364..8d24e021b4c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewEffortAggregator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregator.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.base.MoreObjects; import com.google.common.collect.ArrayListMultimap; @@ -29,14 +29,14 @@ import org.sonar.api.measures.CoreMetrics; import org.sonar.core.issue.DefaultIssue; import org.sonar.db.DbClient; import org.sonar.db.issue.IssueChangeDto; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; import static org.sonar.api.measures.CoreMetrics.NEW_RELIABILITY_REMEDIATION_EFFORT_KEY; import static org.sonar.api.measures.CoreMetrics.NEW_SECURITY_REMEDIATION_EFFORT_KEY; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewEffortCalculator.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortCalculator.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewEffortCalculator.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortCalculator.java index c031d75da4f..5c201a284f8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewEffortCalculator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortCalculator.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.base.Function; import com.google.common.base.MoreObjects; @@ -37,7 +37,7 @@ import org.apache.commons.lang.time.DateUtils; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.FieldDiffs; import org.sonar.db.issue.IssueChangeDto; -import org.sonar.server.computation.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.Period; import org.sonar.server.issue.IssueUpdater; import static com.google.common.collect.FluentIterable.from; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/Rule.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/Rule.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/Rule.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/Rule.java index 5c0511086dd..8e11b47b80e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/Rule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/Rule.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.util.Set; import javax.annotation.CheckForNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleImpl.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleImpl.java index d1eace80114..9219efc2dfd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.base.MoreObjects; import java.util.Set; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepository.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepository.java index d34d47762e2..a5594def81b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepository.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.base.Optional; import org.sonar.api.rule.RuleKey; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImpl.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleRepositoryImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImpl.java index a573bfe8f55..55d8d00adbf 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleRepositoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleTagsCopier.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopier.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleTagsCopier.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopier.java index 4ef4e72bee2..629ac03b3bb 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleTagsCopier.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopier.java @@ -17,10 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static com.google.common.collect.Sets.union; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleTypeCopier.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopier.java similarity index 90% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleTypeCopier.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopier.java index 645f10248c0..bc8cf4b7046 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleTypeCopier.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopier.java @@ -17,10 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; public class RuleTypeCopier extends IssueVisitor { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/ScmAccountToUser.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUser.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/ScmAccountToUser.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUser.java index eb79e5dcce1..c301fee14ec 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/ScmAccountToUser.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUser.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import org.sonar.server.util.cache.MemoryCache; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/ScmAccountToUserLoader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoader.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/ScmAccountToUserLoader.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoader.java index 51fbd7490d5..ffc3534a2e4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/ScmAccountToUserLoader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoader.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.base.Function; import com.google.common.base.Joiner; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerBaseInputFactory.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactory.java similarity index 90% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerBaseInputFactory.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactory.java index 5714d4dbd8b..70cf3198550 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerBaseInputFactory.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactory.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.util.Collections; import java.util.List; @@ -30,9 +30,9 @@ import org.sonar.core.issue.tracking.LineHashSequence; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.MyBatis; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.filemove.MovedFilesRepository; -import org.sonar.server.computation.filemove.MovedFilesRepository.OriginalFile; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.filemove.MovedFilesRepository; +import org.sonar.server.computation.task.projectanalysis.filemove.MovedFilesRepository.OriginalFile; /** * Factory of {@link Input} of base data for issue tracking. Data are lazy-loaded. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerExecution.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerExecution.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerExecution.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerExecution.java index a9cc4f071f9..d87ef5e3c49 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerExecution.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerExecution.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.tracking.Tracker; import org.sonar.core.issue.tracking.Tracking; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; public class TrackerExecution { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerRawInputFactory.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactory.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerRawInputFactory.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactory.java index e5fa25fbc74..aaa3c778eae 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerRawInputFactory.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactory.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.util.ArrayList; import java.util.Collections; @@ -34,12 +34,12 @@ import org.sonar.db.protobuf.DbCommons; import org.sonar.db.protobuf.DbIssues; import org.sonar.scanner.protocol.Constants.Severity; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.batch.BatchReportReader; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.issue.commonrule.CommonRuleEngine; -import org.sonar.server.computation.issue.filter.IssueFilter; -import org.sonar.server.computation.source.SourceLinesRepository; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.issue.commonrule.CommonRuleEngine; +import org.sonar.server.computation.task.projectanalysis.issue.filter.IssueFilter; +import org.sonar.server.computation.task.projectanalysis.source.SourceLinesRepository; import org.sonar.server.rule.CommonRuleKeys; import static com.google.common.collect.Lists.newArrayList; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/UpdateConflictResolver.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolver.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/UpdateConflictResolver.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolver.java index 96f98d731b8..c3903c36486 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/UpdateConflictResolver.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolver.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.annotations.VisibleForTesting; import org.sonar.api.utils.log.Logger; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/AbstractCoverageRule.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/AbstractCoverageRule.java similarity index 84% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/AbstractCoverageRule.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/AbstractCoverageRule.java index da8255b2863..e4ffe3503c0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/AbstractCoverageRule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/AbstractCoverageRule.java @@ -17,15 +17,15 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.commonrule; +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; import com.google.common.base.Optional; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.qualityprofile.ActiveRule; -import org.sonar.server.computation.qualityprofile.ActiveRulesHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolder; public abstract class AbstractCoverageRule extends CommonRule { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/BranchCoverageRule.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRule.java similarity index 84% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/BranchCoverageRule.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRule.java index 7554bdc3d42..d38e6b2ad18 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/BranchCoverageRule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRule.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.commonrule; +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.qualityprofile.ActiveRulesHolder; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolder; import org.sonar.server.rule.CommonRuleKeys; import static java.lang.String.format; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/CommentDensityRule.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRule.java similarity index 86% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/CommentDensityRule.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRule.java index 59766be6e0d..5e4af3a6528 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/CommentDensityRule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRule.java @@ -17,17 +17,17 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.commonrule; +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; import com.google.common.base.Optional; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.qualityprofile.ActiveRule; -import org.sonar.server.computation.qualityprofile.ActiveRulesHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolder; import org.sonar.server.rule.CommonRuleKeys; import static java.lang.String.format; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/CommonRule.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRule.java similarity index 90% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/CommonRule.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRule.java index aac4481a0d7..877ae58d9e6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/CommonRule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRule.java @@ -17,15 +17,15 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.commonrule; +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; import com.google.common.base.Optional; import javax.annotation.CheckForNull; import org.sonar.api.rule.RuleKey; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.qualityprofile.ActiveRule; -import org.sonar.server.computation.qualityprofile.ActiveRulesHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolder; import static org.apache.commons.lang.StringUtils.isNotBlank; import static org.sonar.server.rule.CommonRuleKeys.commonRepositoryForLang; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/CommonRuleEngine.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngine.java similarity index 87% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/CommonRuleEngine.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngine.java index 49deeee3d67..0e11eafd834 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/CommonRuleEngine.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngine.java @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.commonrule; +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; import java.util.Collection; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; /** * Generate the issues related to "common rules", which are diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/CommonRuleEngineImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImpl.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/CommonRuleEngineImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImpl.java index 3890da2145b..2fa0301e33d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/CommonRuleEngineImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImpl.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.commonrule; +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; import java.util.ArrayList; import java.util.Collection; import javax.annotation.CheckForNull; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; public class CommonRuleEngineImpl implements CommonRuleEngine { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/DuplicatedBlockRule.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRule.java similarity index 76% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/DuplicatedBlockRule.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRule.java index 92851305dcd..273a7a2775a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/DuplicatedBlockRule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRule.java @@ -17,17 +17,17 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.commonrule; +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; import com.google.common.base.Optional; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.qualityprofile.ActiveRule; -import org.sonar.server.computation.qualityprofile.ActiveRulesHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolder; import org.sonar.server.rule.CommonRuleKeys; import static java.lang.String.format; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/LineCoverageRule.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRule.java similarity index 84% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/LineCoverageRule.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRule.java index 92f97a615c7..ceffc029b51 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/LineCoverageRule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRule.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.commonrule; +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.qualityprofile.ActiveRulesHolder; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolder; import org.sonar.server.rule.CommonRuleKeys; import static java.lang.String.format; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/SkippedTestRule.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRule.java similarity index 75% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/SkippedTestRule.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRule.java index 9181022ef83..4998e886eb5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/SkippedTestRule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRule.java @@ -17,17 +17,17 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.commonrule; +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; import com.google.common.base.Optional; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.qualityprofile.ActiveRule; -import org.sonar.server.computation.qualityprofile.ActiveRulesHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolder; import org.sonar.server.rule.CommonRuleKeys; import static java.lang.String.format; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/TestErrorRule.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRule.java similarity index 78% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/TestErrorRule.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRule.java index becd47d817e..e26196982f1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/commonrule/TestErrorRule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRule.java @@ -17,17 +17,17 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.commonrule; +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; import com.google.common.base.Optional; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.qualityprofile.ActiveRule; -import org.sonar.server.computation.qualityprofile.ActiveRulesHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolder; import org.sonar.server.rule.CommonRuleKeys; import static java.lang.String.format; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/package-info.java new file mode 100644 index 00000000000..9de70006161 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/filter/IssueFilter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilter.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/filter/IssueFilter.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilter.java index 38232233069..b7fe143f9db 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/filter/IssueFilter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilter.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.filter; +package org.sonar.server.computation.task.projectanalysis.issue.filter; import com.google.common.base.Splitter; import java.util.ArrayList; @@ -28,9 +28,9 @@ import org.sonar.api.config.Settings; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.SettingsRepository; -import org.sonar.server.computation.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.SettingsRepository; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Strings.isNullOrEmpty; @@ -40,7 +40,7 @@ import static org.sonar.core.config.IssueExclusionProperties.PATTERNS_MULTICRITE import static org.sonar.core.config.IssueExclusionProperties.PATTERNS_MULTICRITERIA_INCLUSION_KEY; import static org.sonar.core.config.IssueExclusionProperties.RESOURCE_KEY; import static org.sonar.core.config.IssueExclusionProperties.RULE_KEY; -import static org.sonar.server.computation.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; @ComputeEngineSide public class IssueFilter { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/filter/IssuePattern.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePattern.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/issue/filter/IssuePattern.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePattern.java index 86d7b420f24..3e55c819bf6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/filter/IssuePattern.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePattern.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.filter; +package org.sonar.server.computation.task.projectanalysis.issue.filter; import javax.annotation.Nullable; import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.WildcardPattern; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; public class IssuePattern { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/package-info.java new file mode 100644 index 00000000000..e7229e7f464 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.issue.filter; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/package-info.java new file mode 100644 index 00000000000..1df647759c2 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.issue; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/language/LanguageRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepository.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/language/LanguageRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepository.java index 61679a7f354..d0f3d3cffb7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/language/LanguageRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepository.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.language; +package org.sonar.server.computation.task.projectanalysis.language; import com.google.common.base.Optional; import org.sonar.api.resources.Language; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/language/LanguageRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImpl.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/language/LanguageRepositoryImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImpl.java index 4abf777513c..c2040c83983 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/language/LanguageRepositoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.language; +package org.sonar.server.computation.task.projectanalysis.language; import com.google.common.base.Function; import com.google.common.base.Optional; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/package-info.java new file mode 100644 index 00000000000..40fde17672d --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/language/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.language; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BatchMeasureToMeasure.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasure.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/BatchMeasureToMeasure.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasure.java index d238f577d74..719f49d50a6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BatchMeasureToMeasure.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasure.java @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.base.Optional; import java.util.Objects; import javax.annotation.Nullable; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.Measure.ValueCase; -import org.sonar.server.computation.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; import static com.google.common.base.Optional.of; import static org.apache.commons.lang.StringUtils.trimToNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BestValueOptimization.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimization.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/BestValueOptimization.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimization.java index 1252c7f474b..d1474d5581f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BestValueOptimization.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimization.java @@ -17,17 +17,17 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import javax.annotation.Nonnull; import org.apache.commons.lang.math.NumberUtils; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; import static java.util.Objects.requireNonNull; -import static org.sonar.server.computation.measure.Measure.ValueType.NO_VALUE; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.ValueType.NO_VALUE; public class BestValueOptimization implements Predicate { private final Metric metric; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MapBasedRawMeasureRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepository.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/MapBasedRawMeasureRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepository.java index ebbeffde0ac..8c12e9da7e9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MapBasedRawMeasureRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepository.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -30,8 +30,8 @@ import java.util.Map; import java.util.Set; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.FluentIterable.from; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/Measure.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/Measure.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/Measure.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/Measure.java index ebae93869d7..0583c05ed21 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/Measure.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/Measure.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.base.Optional; import java.math.BigDecimal; @@ -26,7 +26,7 @@ import java.util.Locale; import java.util.Objects; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import org.sonar.server.computation.component.Developer; +import org.sonar.server.computation.task.projectanalysis.component.Developer; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureComputersHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolder.java similarity index 87% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureComputersHolder.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolder.java index 6c051171cf9..413254a1b5c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureComputersHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolder.java @@ -17,9 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; -import org.sonar.server.computation.measure.api.MeasureComputerWrapper; +import org.sonar.server.computation.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; public interface MeasureComputersHolder { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureComputersHolderImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImpl.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureComputersHolderImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImpl.java index f34a0c15da1..ae01ac76f6a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureComputersHolderImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImpl.java @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.base.Predicates; import javax.annotation.CheckForNull; -import org.sonar.server.computation.measure.api.MeasureComputerWrapper; +import org.sonar.server.computation.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.FluentIterable.from; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureComputersVisitor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersVisitor.java similarity index 69% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureComputersVisitor.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersVisitor.java index 937b0bef4bb..fe661950db5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureComputersVisitor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersVisitor.java @@ -17,22 +17,22 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import org.sonar.api.ce.measure.MeasureComputer; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.SettingsRepository; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; -import org.sonar.server.computation.issue.ComponentIssuesRepository; -import org.sonar.server.computation.measure.api.MeasureComputerContextImpl; -import org.sonar.server.computation.measure.api.MeasureComputerWrapper; -import org.sonar.server.computation.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.SettingsRepository; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.issue.ComponentIssuesRepository; +import org.sonar.server.computation.task.projectanalysis.api.measurecomputer.MeasureComputerContextImpl; +import org.sonar.server.computation.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; public class MeasureComputersVisitor extends TypeAwareVisitorAdapter { @@ -56,7 +56,7 @@ public class MeasureComputersVisitor extends TypeAwareVisitorAdapter { } @Override - public void visitAny(org.sonar.server.computation.component.Component component) { + public void visitAny(org.sonar.server.computation.task.projectanalysis.component.Component component) { MeasureComputerContextImpl context = new MeasureComputerContextImpl(component, settings, measureRepository, metricRepository, componentIssuesRepository); for (MeasureComputerWrapper measureComputerWrapper : measureComputersHolder.getMeasureComputers()) { context.setDefinition(measureComputerWrapper.getDefinition()); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureDtoToMeasure.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasure.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureDtoToMeasure.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasure.java index 3f34df2fc7b..7e769708ce2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureDtoToMeasure.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasure.java @@ -17,16 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.base.Optional; import javax.annotation.Nullable; import org.sonar.db.measure.MeasureDto; -import org.sonar.server.computation.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; import static com.google.common.base.Optional.of; import static java.util.Objects.requireNonNull; -import static org.sonar.server.computation.measure.Measure.Level.toLevel; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.Level.toLevel; public class MeasureDtoToMeasure { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureKey.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKey.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureKey.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKey.java index 3d617c85fca..4f7be27e045 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureKey.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKey.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import java.util.Objects; import javax.annotation.CheckForNull; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; -import org.sonar.server.computation.component.Developer; +import org.sonar.server.computation.task.projectanalysis.component.Developer; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepository.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepository.java index f6c5612edaa..4a0aa420347 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepository.java @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.base.Optional; import com.google.common.collect.SetMultimap; import java.util.Set; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricImpl; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricImpl; public interface MeasureRepository { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImpl.java similarity index 87% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepositoryImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImpl.java index 45ceb063527..40416f1e1d8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepositoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.base.Optional; import com.google.common.collect.SetMultimap; @@ -29,15 +29,15 @@ import org.sonar.db.DbSession; import org.sonar.db.measure.MeasureDto; import org.sonar.db.measure.MeasureQuery; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.batch.BatchReportReader; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.measure.MapBasedRawMeasureRepository.OverridePolicy; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.metric.ReportMetricValidator; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.measure.MapBasedRawMeasureRepository.OverridePolicy; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.metric.ReportMetricValidator; import static java.util.Objects.requireNonNull; -import static org.sonar.server.computation.component.ComponentFunctions.toReportRef; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentFunctions.toReportRef; public class MeasureRepositoryImpl implements MeasureRepository { private final MapBasedRawMeasureRepository delegate = new MapBasedRawMeasureRepository<>(toReportRef()); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureToMeasureDto.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDto.java similarity index 89% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureToMeasureDto.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDto.java index 500ba0e6151..a48ad4aeb96 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureToMeasureDto.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDto.java @@ -17,16 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import org.sonar.db.measure.MeasureDto; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.DbIdsRepository; -import org.sonar.server.computation.component.Developer; -import org.sonar.server.computation.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.DbIdsRepository; +import org.sonar.server.computation.task.projectanalysis.component.Developer; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; public class MeasureToMeasureDto { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureVariations.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureVariations.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureVariations.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureVariations.java index b37d8b44ec8..ec94293013f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureVariations.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureVariations.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.base.MoreObjects; import java.util.Arrays; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; -import org.sonar.server.computation.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.Period; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MutableMeasureComputersHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MutableMeasureComputersHolder.java similarity index 88% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/MutableMeasureComputersHolder.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MutableMeasureComputersHolder.java index 00ca8cf3c3d..bb85d7327f2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MutableMeasureComputersHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MutableMeasureComputersHolder.java @@ -17,9 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; -import org.sonar.server.computation.measure.api.MeasureComputerWrapper; +import org.sonar.server.computation.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; /** * A {@link MeasureComputersHolder} which value can be set only once. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/QualityGateStatus.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatus.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/QualityGateStatus.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatus.java index eaf28b896d9..8bf63054104 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/QualityGateStatus.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatus.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.base.MoreObjects; import javax.annotation.CheckForNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/package-info.java new file mode 100644 index 00000000000..9c6a38c780f --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.measure; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/qualitygatedetails/EvaluatedCondition.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedCondition.java similarity index 86% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/qualitygatedetails/EvaluatedCondition.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedCondition.java index 0cf5ad99b1a..d765b6795fe 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/qualitygatedetails/EvaluatedCondition.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedCondition.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure.qualitygatedetails; +package org.sonar.server.computation.task.projectanalysis.measure.qualitygatedetails; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.qualitygate.Condition; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.qualitygate.Condition; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/qualitygatedetails/QualityGateDetailsData.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsData.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/measure/qualitygatedetails/QualityGateDetailsData.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsData.java index 007d1f9d3ac..95f99ec1691 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/qualitygatedetails/QualityGateDetailsData.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsData.java @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure.qualitygatedetails; +package org.sonar.server.computation.task.projectanalysis.measure.qualitygatedetails; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import java.util.List; import javax.annotation.concurrent.Immutable; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.qualitygate.Condition; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.qualitygate.Condition; import static com.google.common.collect.FluentIterable.from; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/package-info.java new file mode 100644 index 00000000000..f32f40d592f --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.measure.qualitygatedetails; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/Metric.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/Metric.java similarity index 90% rename from server/sonar-server/src/main/java/org/sonar/server/computation/metric/Metric.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/Metric.java index 0d25faf54bb..ac9406e0abf 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/Metric.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/Metric.java @@ -17,10 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.metric; +package org.sonar.server.computation.task.projectanalysis.metric; import javax.annotation.CheckForNull; -import org.sonar.server.computation.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; public interface Metric { /** @@ -51,7 +51,7 @@ public interface Metric { /** * The decimal scale of float measures. Returned value is greater than or equal zero. - * @throws IllegalStateException if the value type is not decimal (see {@link org.sonar.server.computation.measure.Measure.ValueType} + * @throws IllegalStateException if the value type is not decimal (see {@link org.sonar.server.computation.task.projectanalysis.measure.Measure.ValueType} */ int getDecimalScale(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricDtoToMetric.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetric.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricDtoToMetric.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetric.java index de4e6e39ca6..de98857e6c7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricDtoToMetric.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetric.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.metric; +package org.sonar.server.computation.task.projectanalysis.metric; import com.google.common.base.Function; import javax.annotation.Nonnull; import org.sonar.db.metric.MetricDto; -import org.sonar.server.computation.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; import static com.google.common.base.MoreObjects.firstNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImpl.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImpl.java index 38e1aeafe29..31ca5166ee7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImpl.java @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.metric; +package org.sonar.server.computation.task.projectanalysis.metric; import com.google.common.base.MoreObjects; import java.util.Objects; import javax.annotation.CheckForNull; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; -import org.sonar.server.computation.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricModule.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricModule.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricModule.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricModule.java index b93bebbce54..d33161e750e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricModule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricModule.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.metric; +package org.sonar.server.computation.task.projectanalysis.metric; import org.sonar.core.metric.ScannerMetrics; import org.sonar.core.platform.Module; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepository.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepository.java index ede9d8fd889..c081ace9591 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepository.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.metric; +package org.sonar.server.computation.task.projectanalysis.metric; public interface MetricRepository { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImpl.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricRepositoryImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImpl.java index e2a5727fd45..1356754252c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricRepositoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.metric; +package org.sonar.server.computation.task.projectanalysis.metric; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/ReportMetricValidator.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidator.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/metric/ReportMetricValidator.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidator.java index 07286b85859..72a123e5238 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/ReportMetricValidator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidator.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.metric; +package org.sonar.server.computation.task.projectanalysis.metric; /** * Validate metric to know if it can be read from the batch diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/ReportMetricValidatorImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImpl.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/metric/ReportMetricValidatorImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImpl.java index 8d94d329fd2..57758079747 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/ReportMetricValidatorImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.metric; +package org.sonar.server.computation.task.projectanalysis.metric; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/package-info.java new file mode 100644 index 00000000000..6880f732567 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.metric; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/container/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/package-info.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/computation/container/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/package-info.java index d544e7b35bf..b7ed32aaa94 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/container/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.computation.container; +package org.sonar.server.computation.task.projectanalysis; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/period/Period.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/Period.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/period/Period.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/Period.java index b794f80459d..0b94b22fed6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/period/Period.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/Period.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.period; +package org.sonar.server.computation.task.projectanalysis.period; import java.util.Objects; import javax.annotation.CheckForNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/period/PeriodPredicates.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodPredicates.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/period/PeriodPredicates.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodPredicates.java index 9ce2b8adb83..ba692fbeaa4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/period/PeriodPredicates.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodPredicates.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.period; +package org.sonar.server.computation.task.projectanalysis.period; import com.google.common.base.Predicate; import javax.annotation.Nonnull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/period/PeriodsHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodsHolder.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/period/PeriodsHolder.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodsHolder.java index c3b437150e9..abdc23d66fb 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/period/PeriodsHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodsHolder.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.period; +package org.sonar.server.computation.task.projectanalysis.period; import java.util.List; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/period/PeriodsHolderImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodsHolderImpl.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/period/PeriodsHolderImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodsHolderImpl.java index 3cb4a9275cd..c8f016c536a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/period/PeriodsHolderImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodsHolderImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.period; +package org.sonar.server.computation.task.projectanalysis.period; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -31,7 +31,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.FluentIterable.from; import static java.util.Objects.requireNonNull; -import static org.sonar.server.computation.period.Period.isValidPeriodIndex; +import static org.sonar.server.computation.task.projectanalysis.period.Period.isValidPeriodIndex; public class PeriodsHolderImpl implements PeriodsHolder { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/package-info.java new file mode 100644 index 00000000000..ef831089ed9 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/period/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.period; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/Condition.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/Condition.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/Condition.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/Condition.java index 53b6d38a71a..4415e306633 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/Condition.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/Condition.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import com.google.common.base.MoreObjects; import javax.annotation.CheckForNull; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; -import org.sonar.server.computation.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; import static java.util.Objects.hash; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/ConditionEvaluator.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluator.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/ConditionEvaluator.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluator.java index 112bf881803..08205dc277b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/ConditionEvaluator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluator.java @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import com.google.common.base.Optional; import javax.annotation.CheckForNull; import org.apache.commons.lang.StringUtils; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; import static com.google.common.base.Optional.of; import static com.google.common.base.Preconditions.checkArgument; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/ConditionStatus.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatus.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/ConditionStatus.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatus.java index 8e41bb52ee8..b8f47e84f36 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/ConditionStatus.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatus.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/EvaluationResult.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResult.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/EvaluationResult.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResult.java index 77797279b10..9a22ce1e537 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/EvaluationResult.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResult.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import com.google.common.base.MoreObjects; import javax.annotation.CheckForNull; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; -import org.sonar.server.computation.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/EvaluationResultTextConverter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverter.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/EvaluationResultTextConverter.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverter.java index c7d32df5a69..e371b5807b4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/EvaluationResultTextConverter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverter.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import javax.annotation.CheckForNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/EvaluationResultTextConverterImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterImpl.java similarity index 89% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/EvaluationResultTextConverterImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterImpl.java index b7fc99d1ce2..c330349ac82 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/EvaluationResultTextConverterImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import com.google.common.collect.ImmutableMap; import java.util.Locale; @@ -28,13 +28,13 @@ import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.Duration; import org.sonar.api.utils.Durations; import org.sonar.core.timemachine.Periods; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; import static java.util.Objects.requireNonNull; -import static org.sonar.server.computation.measure.Measure.Level.ERROR; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.Level.ERROR; public final class EvaluationResultTextConverterImpl implements EvaluationResultTextConverter { private static final String VARIATION_METRIC_PREFIX = "new_"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/MutableQualityGateHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolder.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/MutableQualityGateHolder.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolder.java index 7f571d94aeb..82dc460ca4f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/MutableQualityGateHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolder.java @@ -17,9 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; public interface MutableQualityGateHolder extends QualityGateHolder { /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/MutableQualityGateStatusHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolder.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/MutableQualityGateStatusHolder.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolder.java index 3e0067c8a0b..dec1c58966d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/MutableQualityGateStatusHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolder.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import java.util.Map; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGate.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGate.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGate.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGate.java index fe4dcfad111..1d4d5b202ab 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGate.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGate.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import java.util.Objects; import java.util.Set; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolder.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateHolder.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolder.java index 5aa23f250da..04a721257f4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolder.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import com.google.common.base.Optional; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateHolderImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImpl.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateHolderImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImpl.java index a8e0c8148cb..1bfaeb5db81 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateHolderImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import com.google.common.base.Optional; import javax.annotation.CheckForNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateService.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateService.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateService.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateService.java index 18703a65e2b..3dcd8ea19ff 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateService.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import com.google.common.base.Optional; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateServiceImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImpl.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateServiceImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImpl.java index 5f1a463bd3e..6cb78b36ba5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateServiceImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -25,8 +25,8 @@ import org.sonar.db.qualitygate.QualityGateConditionDao; import org.sonar.db.qualitygate.QualityGateConditionDto; import org.sonar.db.qualitygate.QualityGateDao; import org.sonar.db.qualitygate.QualityGateDto; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; import static com.google.common.collect.FluentIterable.from; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateStatus.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatus.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateStatus.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatus.java index 7517e95cadd..317e7465602 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateStatus.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatus.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; public enum QualityGateStatus { OK, WARN, ERROR diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateStatusHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolder.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateStatusHolder.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolder.java index cf212aaa2cc..e0271c0ac74 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateStatusHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolder.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import java.util.Map; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateStatusHolderImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImpl.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateStatusHolderImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImpl.java index 92a89dd44fe..5284e79c794 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateStatusHolderImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import com.google.common.collect.ImmutableMap; import java.util.Map; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/package-info.java new file mode 100644 index 00000000000..85ca3e597f1 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.qualitygate; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/NewQualityModelMeasuresVisitor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewQualityModelMeasuresVisitor.java similarity index 85% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/NewQualityModelMeasuresVisitor.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewQualityModelMeasuresVisitor.java index 325c76a4d03..7afa431d975 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/NewQualityModelMeasuresVisitor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewQualityModelMeasuresVisitor.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitymodel; +package org.sonar.server.computation.task.projectanalysis.qualitymodel; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -29,29 +29,29 @@ import org.sonar.api.measures.CoreMetrics; import org.sonar.api.utils.KeyValueFormat; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.PathAwareVisitorAdapter; -import org.sonar.server.computation.formula.counter.LongVariationValue; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolder; -import org.sonar.server.computation.scm.Changeset; -import org.sonar.server.computation.scm.ScmInfo; -import org.sonar.server.computation.scm.ScmInfoRepository; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.formula.counter.LongVariationValue; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.scm.Changeset; +import org.sonar.server.computation.task.projectanalysis.scm.ScmInfo; +import org.sonar.server.computation.task.projectanalysis.scm.ScmInfoRepository; import static com.google.common.collect.FluentIterable.from; import static org.sonar.api.utils.KeyValueFormat.newIntegerConverter; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureVariations.newMeasureVariationsBuilder; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations.newMeasureVariationsBuilder; /** - * This visitor depends on {@link org.sonar.server.computation.issue.IntegrateIssuesVisitor} for the computation of + * This visitor depends on {@link org.sonar.server.computation.task.projectanalysis.issue.IntegrateIssuesVisitor} for the computation of * metric {@link CoreMetrics#NEW_TECHNICAL_DEBT}. * * Compute following measure : diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/QualityModelMeasuresVisitor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/QualityModelMeasuresVisitor.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/QualityModelMeasuresVisitor.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/QualityModelMeasuresVisitor.java index 8fb1b81cfd1..fec8e305c2e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/QualityModelMeasuresVisitor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/QualityModelMeasuresVisitor.java @@ -17,22 +17,22 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitymodel; +package org.sonar.server.computation.task.projectanalysis.qualitymodel; import com.google.common.base.Optional; import org.sonar.api.ce.measure.Issue; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.PathAwareVisitorAdapter; -import org.sonar.server.computation.issue.ComponentIssuesRepository; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.qualitymodel.RatingGrid.Rating; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.issue.ComponentIssuesRepository; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingGrid.Rating; import static org.sonar.api.measures.CoreMetrics.DEVELOPMENT_COST_KEY; import static org.sonar.api.measures.CoreMetrics.EFFORT_TO_REACH_MAINTAINABILITY_RATING_A_KEY; @@ -48,8 +48,8 @@ import static org.sonar.api.rule.Severity.MAJOR; import static org.sonar.api.rule.Severity.MINOR; import static org.sonar.api.rules.RuleType.BUG; import static org.sonar.api.rules.RuleType.VULNERABILITY; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; /** * Compute following measures : diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/RatingGrid.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingGrid.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/RatingGrid.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingGrid.java index 8cf286e04bb..1ffa36fe7e3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/RatingGrid.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingGrid.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitymodel; +package org.sonar.server.computation.task.projectanalysis.qualitymodel; import com.google.common.annotations.VisibleForTesting; import java.util.Arrays; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/RatingSettings.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingSettings.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/RatingSettings.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingSettings.java index f36920a1a32..0e9b04e5ba1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/RatingSettings.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingSettings.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitymodel; +package org.sonar.server.computation.task.projectanalysis.qualitymodel; import com.google.common.collect.ImmutableMap; import java.util.Map; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/package-info.java new file mode 100644 index 00000000000..96bac222b3c --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.qualitymodel; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/ActiveRule.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRule.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/ActiveRule.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRule.java index 7dbbde715ac..e8c5f97c056 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/ActiveRule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRule.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualityprofile; +package org.sonar.server.computation.task.projectanalysis.qualityprofile; import com.google.common.collect.ImmutableMap; import java.util.Map; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/ActiveRulesHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolder.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/ActiveRulesHolder.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolder.java index 019abf5f52b..417f4f5e16e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/ActiveRulesHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolder.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualityprofile; +package org.sonar.server.computation.task.projectanalysis.qualityprofile; import com.google.common.base.Optional; import org.sonar.api.rule.RuleKey; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/ActiveRulesHolderImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImpl.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/ActiveRulesHolderImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImpl.java index 4ca427a7701..17630af3a51 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/ActiveRulesHolderImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualityprofile; +package org.sonar.server.computation.task.projectanalysis.qualityprofile; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/QPMeasureData.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/QPMeasureData.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/QPMeasureData.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/QPMeasureData.java index 36f8c1b3531..185caa48c37 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/QPMeasureData.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/QPMeasureData.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualityprofile; +package org.sonar.server.computation.task.projectanalysis.qualityprofile; import com.google.common.base.Function; import com.google.common.collect.ImmutableSortedSet; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/QualityProfile.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/QualityProfile.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/QualityProfile.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/QualityProfile.java index 50fa860e562..4bb82551be8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/QualityProfile.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/QualityProfile.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualityprofile; +package org.sonar.server.computation.task.projectanalysis.qualityprofile; import com.google.common.base.MoreObjects; import java.util.Date; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/package-info.java new file mode 100644 index 00000000000..7468078433c --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.qualityprofile; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/CleanReportQueueListener.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/queue/CleanReportQueueListener.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/CleanReportQueueListener.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/queue/CleanReportQueueListener.java index e8a1d63c917..8c90ead304e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/report/CleanReportQueueListener.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/queue/CleanReportQueueListener.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.queue.report; +package org.sonar.server.computation.task.projectanalysis.queue; import org.sonar.ce.queue.report.ReportFiles; import org.sonar.db.ce.CeActivityDto; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/queue/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/queue/package-info.java new file mode 100644 index 00000000000..76cc120f6e1 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/queue/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.queue; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/Changeset.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/Changeset.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/scm/Changeset.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/Changeset.java index 522d1d3f990..3ddabc0af95 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/Changeset.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/Changeset.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.scm; +package org.sonar.server.computation.task.projectanalysis.scm; import java.util.Objects; import javax.annotation.CheckForNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/DbScmInfo.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfo.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/scm/DbScmInfo.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfo.java index 0f2cb035ad3..35f26c2ac33 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/DbScmInfo.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfo.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.scm; +package org.sonar.server.computation.task.projectanalysis.scm; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -28,7 +28,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; import org.sonar.db.protobuf.DbFileSources; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Predicates.notNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/ReportScmInfo.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfo.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/scm/ReportScmInfo.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfo.java index 5863a7e5159..f6bee21a0a0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/ReportScmInfo.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfo.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.scm; +package org.sonar.server.computation.task.projectanalysis.scm; import com.google.common.base.Function; import java.util.HashMap; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/ScmInfo.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfo.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/scm/ScmInfo.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfo.java index c47d7da117c..2385ff85691 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/ScmInfo.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfo.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.scm; +package org.sonar.server.computation.task.projectanalysis.scm; /** * Represents the Scm information for a specific file. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/ScmInfoImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImpl.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/scm/ScmInfoImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImpl.java index 3a5bba93aef..d5f82e49f8a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/ScmInfoImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.scm; +package org.sonar.server.computation.task.projectanalysis.scm; import com.google.common.base.Predicate; import java.util.Arrays; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/ScmInfoRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepository.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/scm/ScmInfoRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepository.java index 4a916950e6d..535e6769ba4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/ScmInfoRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepository.java @@ -17,10 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.scm; +package org.sonar.server.computation.task.projectanalysis.scm; import com.google.common.base.Optional; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; /** * Return SCM information of components. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/ScmInfoRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImpl.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/computation/scm/ScmInfoRepositoryImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImpl.java index 76c94434c2c..77f4d3dca61 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/scm/ScmInfoRepositoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.scm; +package org.sonar.server.computation.task.projectanalysis.scm; import com.google.common.base.Optional; import java.util.HashMap; @@ -28,10 +28,10 @@ import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.source.FileSourceDto; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.batch.BatchReportReader; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.source.SourceHashRepository; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.source.SourceHashRepository; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/component/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/package-info.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/component/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/package-info.java index 14b774e8cc4..31306c8804c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/component/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.scm; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/ComputeFileSourceData.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceData.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/source/ComputeFileSourceData.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceData.java index 475c80370e1..b59b6ea8f9f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/ComputeFileSourceData.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceData.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import com.google.common.base.Joiner; import java.util.Iterator; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/CoverageLineReader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/CoverageLineReader.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/source/CoverageLineReader.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/CoverageLineReader.java index 9f30c7adfbe..a54a20f6e8a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/CoverageLineReader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/CoverageLineReader.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import java.util.Iterator; import javax.annotation.CheckForNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/DuplicationLineReader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReader.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/source/DuplicationLineReader.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReader.java index 689864421fe..954513d7a0f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/DuplicationLineReader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReader.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -29,9 +29,9 @@ import java.util.Map; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.sonar.db.protobuf.DbFileSources; -import org.sonar.server.computation.duplication.Duplication; -import org.sonar.server.computation.duplication.InnerDuplicate; -import org.sonar.server.computation.duplication.TextBlock; +import org.sonar.server.computation.task.projectanalysis.duplication.Duplication; +import org.sonar.server.computation.task.projectanalysis.duplication.InnerDuplicate; +import org.sonar.server.computation.task.projectanalysis.duplication.TextBlock; import static com.google.common.collect.FluentIterable.from; import static com.google.common.collect.Iterables.size; @@ -73,7 +73,7 @@ public class DuplicationLineReader implements LineReader { /** * Duplicated blocks in the current file are either {@link Duplication#getOriginal()} or {@link Duplication#getDuplicates()} - * when the {@link org.sonar.server.computation.duplication.Duplicate} is a {@link InnerDuplicate}. + * when the {@link org.sonar.server.computation.task.projectanalysis.duplication.Duplicate} is a {@link InnerDuplicate}. *

* The returned list is mutable on purpose because it will be sorted. *

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/HighlightingLineReader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReader.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/computation/source/HighlightingLineReader.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReader.java index 6d96228e836..69781d6999a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/HighlightingLineReader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReader.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import com.google.common.collect.ImmutableMap; import java.util.Iterator; @@ -29,13 +29,13 @@ import org.sonar.api.utils.log.Loggers; import org.sonar.db.protobuf.DbFileSources; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.SyntaxHighlightingRule.HighlightingType; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.source.RangeOffsetConverter.RangeOffsetConverterException; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.source.RangeOffsetConverter.RangeOffsetConverterException; import static com.google.common.collect.Lists.newArrayList; import static java.lang.String.format; -import static org.sonar.server.computation.source.RangeOffsetConverter.OFFSET_SEPARATOR; -import static org.sonar.server.computation.source.RangeOffsetConverter.SYMBOLS_SEPARATOR; +import static org.sonar.server.computation.task.projectanalysis.source.RangeOffsetConverter.OFFSET_SEPARATOR; +import static org.sonar.server.computation.task.projectanalysis.source.RangeOffsetConverter.SYMBOLS_SEPARATOR; public class HighlightingLineReader implements LineReader { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/LastCommitVisitor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitor.java similarity index 82% rename from server/sonar-server/src/main/java/org/sonar/server/computation/source/LastCommitVisitor.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitor.java index 9e6b04b3cc6..aae88deec92 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/LastCommitVisitor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitor.java @@ -17,21 +17,21 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import com.google.common.base.Optional; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.PathAwareVisitorAdapter; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.scm.ScmInfo; -import org.sonar.server.computation.scm.ScmInfoRepository; - -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.scm.ScmInfo; +import org.sonar.server.computation.task.projectanalysis.scm.ScmInfoRepository; + +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; public class LastCommitVisitor extends PathAwareVisitorAdapter { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/LineReader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/LineReader.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/source/LineReader.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/LineReader.java index 3e856756b4a..e0711c862dc 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/LineReader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/LineReader.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import org.sonar.db.protobuf.DbFileSources; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/RangeOffsetConverter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverter.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/source/RangeOffsetConverter.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverter.java index 9cb8b131452..4f41494a4b9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/RangeOffsetConverter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverter.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import org.sonar.scanner.protocol.output.ScannerReport; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/ReportIterator.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ReportIterator.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/source/ReportIterator.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ReportIterator.java index 7851a2b657d..91743bb7132 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/ReportIterator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ReportIterator.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import com.google.common.base.Throwables; import com.google.protobuf.InvalidProtocolBufferException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/ScmLineReader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ScmLineReader.java similarity index 90% rename from server/sonar-server/src/main/java/org/sonar/server/computation/source/ScmLineReader.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ScmLineReader.java index 92a0d4cd8ec..494017a5875 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/ScmLineReader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ScmLineReader.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import javax.annotation.CheckForNull; import org.sonar.db.protobuf.DbFileSources; -import org.sonar.server.computation.scm.Changeset; -import org.sonar.server.computation.scm.ScmInfo; +import org.sonar.server.computation.task.projectanalysis.scm.Changeset; +import org.sonar.server.computation.task.projectanalysis.scm.ScmInfo; public class ScmLineReader implements LineReader { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/SourceHashRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepository.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/source/SourceHashRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepository.java index 8e21b9bc172..30dbfdd047b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/SourceHashRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepository.java @@ -17,9 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; public interface SourceHashRepository { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/SourceHashRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImpl.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/source/SourceHashRepositoryImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImpl.java index 0f815c35ecd..78aea68e94d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/SourceHashRepositoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImpl.java @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import java.util.HashMap; import java.util.Map; import javax.annotation.Nullable; import org.sonar.core.hash.SourceHashComputer; import org.sonar.core.util.CloseableIterator; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/SourceLinesRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepository.java similarity index 85% rename from server/sonar-server/src/main/java/org/sonar/server/computation/source/SourceLinesRepository.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepository.java index b7f621e902c..2ccba7ac20f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/SourceLinesRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepository.java @@ -17,10 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import org.sonar.core.util.CloseableIterator; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; public interface SourceLinesRepository { @@ -28,7 +28,7 @@ public interface SourceLinesRepository { * Creates a iterator over the source lines of a given component from the report. *

* The returned {@link CloseableIterator} will wrap the {@link CloseableIterator} returned by - * {@link org.sonar.server.computation.batch.BatchReportReader#readFileSource(int)} but enforces that the number + * {@link org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader#readFileSource(int)} but enforces that the number * of lines specified by {@link org.sonar.batch.protocol.output.ScannerReport.Component#getLines()} is respected, adding * an extra empty last line if required. *

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/SourceLinesRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImpl.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/source/SourceLinesRepositoryImpl.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImpl.java index 0453f2496f5..44a3413c4ca 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/SourceLinesRepositoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImpl.java @@ -17,17 +17,17 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import com.google.common.base.Optional; import org.sonar.core.util.CloseableIterator; -import org.sonar.server.computation.batch.BatchReportReader; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; -import static org.sonar.server.computation.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; public class SourceLinesRepositoryImpl implements SourceLinesRepository { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/SymbolsLineReader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SymbolsLineReader.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/computation/source/SymbolsLineReader.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SymbolsLineReader.java index c8636dbc82e..132b542e15c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/source/SymbolsLineReader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SymbolsLineReader.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import com.google.common.collect.HashMultimap; import com.google.common.collect.Lists; @@ -33,11 +33,11 @@ import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.db.protobuf.DbFileSources; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static java.lang.String.format; -import static org.sonar.server.computation.source.RangeOffsetConverter.OFFSET_SEPARATOR; -import static org.sonar.server.computation.source.RangeOffsetConverter.SYMBOLS_SEPARATOR; +import static org.sonar.server.computation.task.projectanalysis.source.RangeOffsetConverter.OFFSET_SEPARATOR; +import static org.sonar.server.computation.task.projectanalysis.source.RangeOffsetConverter.SYMBOLS_SEPARATOR; public class SymbolsLineReader implements LineReader { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/package-info.java new file mode 100644 index 00000000000..ae7b285265c --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.source; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/AbstractComputationSteps.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/AbstractComputationSteps.java similarity index 90% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/AbstractComputationSteps.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/AbstractComputationSteps.java index 3ccddf5736e..561b37f207a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/AbstractComputationSteps.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/AbstractComputationSteps.java @@ -17,10 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.collect.Iterables; import org.sonar.core.platform.ContainerPopulator; +import org.sonar.server.computation.task.step.ComputationStep; +import org.sonar.server.computation.task.step.ComputationSteps; /** * Abstract implementation of {@link ComputationStep} which provides the implementation of {@link ComputationSteps#instances()} diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ApplyPermissionsStep.java similarity index 75% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ApplyPermissionsStep.java index bab64346070..f038f98488c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ApplyPermissionsStep.java @@ -17,23 +17,24 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.MyBatis; import org.sonar.db.permission.PermissionRepository; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.DbIdsRepository; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.DbIdsRepository; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.issue.index.IssueAuthorizationIndexer; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; /** * Apply default permissions on new projects and index issues/authorization diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/BuildComponentTreeStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStep.java similarity index 87% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/BuildComponentTreeStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStep.java index d6f0c4fc9cd..fbd0a1f9f7c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/BuildComponentTreeStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.collect.Iterables; import javax.annotation.CheckForNull; @@ -28,16 +28,17 @@ import org.sonar.db.DbSession; import org.sonar.db.component.SnapshotDto; import org.sonar.db.component.SnapshotQuery; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.analysis.MutableAnalysisMetadataHolder; -import org.sonar.server.computation.batch.BatchReportReader; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ComponentImpl; -import org.sonar.server.computation.component.MutableTreeRootHolder; -import org.sonar.server.computation.component.UuidFactory; -import org.sonar.server.computation.analysis.Analysis; +import org.sonar.server.computation.task.projectanalysis.analysis.MutableAnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ComponentImpl; +import org.sonar.server.computation.task.projectanalysis.component.MutableTreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.UuidFactory; +import org.sonar.server.computation.task.projectanalysis.analysis.Analysis; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.Iterables.toArray; -import static org.sonar.server.computation.component.ComponentImpl.builder; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentImpl.builder; /** * Populates the {@link MutableTreeRootHolder} and {@link MutableAnalysisMetadataHolder} from the {@link BatchReportReader} diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CommentMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CommentMeasuresStep.java similarity index 84% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/CommentMeasuresStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CommentMeasuresStep.java index c06bc77c556..161279783e6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CommentMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CommentMeasuresStep.java @@ -17,24 +17,25 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.PathAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.formula.Counter; -import org.sonar.server.computation.formula.CounterInitializationContext; -import org.sonar.server.computation.formula.CreateMeasureContext; -import org.sonar.server.computation.formula.Formula; -import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor; -import org.sonar.server.computation.formula.counter.IntSumCounter; -import org.sonar.server.computation.formula.counter.SumCounter; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.formula.Counter; +import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.server.computation.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.server.computation.task.projectanalysis.formula.Formula; +import org.sonar.server.computation.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.formula.counter.IntSumCounter; +import org.sonar.server.computation.task.projectanalysis.formula.counter.SumCounter; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.step.ComputationStep; import static org.sonar.api.measures.CoreMetrics.COMMENTED_OUT_CODE_LINES_KEY; import static org.sonar.api.measures.CoreMetrics.COMMENT_LINES_DENSITY_KEY; @@ -43,7 +44,7 @@ import static org.sonar.api.measures.CoreMetrics.NCLOC_KEY; import static org.sonar.api.measures.CoreMetrics.PUBLIC_API_KEY; import static org.sonar.api.measures.CoreMetrics.PUBLIC_DOCUMENTED_API_DENSITY_KEY; import static org.sonar.api.measures.CoreMetrics.PUBLIC_UNDOCUMENTED_API_KEY; -import static org.sonar.server.computation.formula.SumFormula.createIntSumFormula; +import static org.sonar.server.computation.task.projectanalysis.formula.SumFormula.createIntSumFormula; /** * Computes comments measures on files and then aggregates them on higher components. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComplexityMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComplexityMeasuresStep.java similarity index 80% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/ComplexityMeasuresStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComplexityMeasuresStep.java index f371a31253c..f710ad91051 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComplexityMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComplexityMeasuresStep.java @@ -17,17 +17,18 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.collect.ImmutableList; -import org.sonar.server.computation.component.PathAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.formula.AverageFormula; -import org.sonar.server.computation.formula.DistributionFormula; -import org.sonar.server.computation.formula.Formula; -import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.formula.AverageFormula; +import org.sonar.server.computation.task.projectanalysis.formula.DistributionFormula; +import org.sonar.server.computation.task.projectanalysis.formula.Formula; +import org.sonar.server.computation.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.step.ComputationStep; import static org.sonar.api.measures.CoreMetrics.CLASSES_KEY; import static org.sonar.api.measures.CoreMetrics.CLASS_COMPLEXITY_DISTRIBUTION_KEY; @@ -41,7 +42,7 @@ import static org.sonar.api.measures.CoreMetrics.FILE_COMPLEXITY_KEY; import static org.sonar.api.measures.CoreMetrics.FUNCTIONS_KEY; import static org.sonar.api.measures.CoreMetrics.FUNCTION_COMPLEXITY_DISTRIBUTION_KEY; import static org.sonar.api.measures.CoreMetrics.FUNCTION_COMPLEXITY_KEY; -import static org.sonar.server.computation.formula.SumFormula.createIntSumFormula; +import static org.sonar.server.computation.task.projectanalysis.formula.SumFormula.createIntSumFormula; /** * Computes complexity measures on files and then aggregates them on higher components. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputeMeasureVariationsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeMeasureVariationsStep.java similarity index 85% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputeMeasureVariationsStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeMeasureVariationsStep.java index da6fc33124d..a34da8128da 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputeMeasureVariationsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeMeasureVariationsStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -33,26 +33,27 @@ import javax.annotation.Nullable; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.measure.PastMeasureDto; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureKey; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureKey; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.FluentIterable.from; import static java.lang.String.format; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; /** * Set variations on all numeric measures found in the repository. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputeQProfileMeasureStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStep.java similarity index 77% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputeQProfileMeasureStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStep.java index 336fc050f32..9da530a8404 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputeQProfileMeasureStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStep.java @@ -17,25 +17,26 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.util.HashMap; import java.util.Map; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.PathAwareCrawler; -import org.sonar.server.computation.component.PathAwareVisitorAdapter; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.qualityprofile.QPMeasureData; -import org.sonar.server.computation.qualityprofile.QualityProfile; - -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.QPMeasureData; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.QualityProfile; +import org.sonar.server.computation.task.step.ComputationStep; + +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; /** * Compute quality profile measure per module based on present languages diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CoverageMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CoverageMeasuresStep.java similarity index 85% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/CoverageMeasuresStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CoverageMeasuresStep.java index 5af342d3798..3bddc74881d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CoverageMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CoverageMeasuresStep.java @@ -17,19 +17,20 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.collect.ImmutableList; -import org.sonar.server.computation.component.PathAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.formula.Formula; -import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor; -import org.sonar.server.computation.formula.coverage.LinesAndConditionsWithUncoveredFormula; -import org.sonar.server.computation.formula.coverage.LinesAndConditionsWithUncoveredMetricKeys; -import org.sonar.server.computation.formula.coverage.SingleWithUncoveredFormula; -import org.sonar.server.computation.formula.coverage.SingleWithUncoveredMetricKeys; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.formula.Formula; +import org.sonar.server.computation.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.formula.coverage.LinesAndConditionsWithUncoveredFormula; +import org.sonar.server.computation.task.projectanalysis.formula.coverage.LinesAndConditionsWithUncoveredMetricKeys; +import org.sonar.server.computation.task.projectanalysis.formula.coverage.SingleWithUncoveredFormula; +import org.sonar.server.computation.task.projectanalysis.formula.coverage.SingleWithUncoveredMetricKeys; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.step.ComputationStep; import static org.sonar.api.measures.CoreMetrics.BRANCH_COVERAGE_KEY; import static org.sonar.api.measures.CoreMetrics.CONDITIONS_TO_COVER_KEY; @@ -52,7 +53,7 @@ import static org.sonar.api.measures.CoreMetrics.OVERALL_UNCOVERED_CONDITIONS_KE import static org.sonar.api.measures.CoreMetrics.OVERALL_UNCOVERED_LINES_KEY; import static org.sonar.api.measures.CoreMetrics.UNCOVERED_CONDITIONS_KEY; import static org.sonar.api.measures.CoreMetrics.UNCOVERED_LINES_KEY; -import static org.sonar.server.computation.formula.SumFormula.createIntSumFormula; +import static org.sonar.server.computation.task.projectanalysis.formula.SumFormula.createIntSumFormula; /** * Computes coverage measures on files and then aggregates them on higher components. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CustomMeasuresCopyStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStep.java similarity index 79% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/CustomMeasuresCopyStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStep.java index 8ffae761c99..6d37649a9f2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CustomMeasuresCopyStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.annotations.VisibleForTesting; import java.util.List; @@ -26,16 +26,17 @@ import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.MyBatis; import org.sonar.db.measure.custom.CustomMeasureDto; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ComponentVisitor; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.step.ComputationStep; public class CustomMeasuresCopyStep implements ComputationStep { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/DuplicationDataMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStep.java similarity index 75% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/DuplicationDataMeasuresStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStep.java index 9884a366d13..926d629dfb6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/DuplicationDataMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStep.java @@ -17,29 +17,30 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.apache.commons.lang.StringEscapeUtils; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; -import org.sonar.server.computation.duplication.CrossProjectDuplicate; -import org.sonar.server.computation.duplication.Duplicate; -import org.sonar.server.computation.duplication.Duplication; -import org.sonar.server.computation.duplication.DuplicationRepository; -import org.sonar.server.computation.duplication.InProjectDuplicate; -import org.sonar.server.computation.duplication.InnerDuplicate; -import org.sonar.server.computation.duplication.TextBlock; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.duplication.CrossProjectDuplicate; +import org.sonar.server.computation.task.projectanalysis.duplication.Duplicate; +import org.sonar.server.computation.task.projectanalysis.duplication.Duplication; +import org.sonar.server.computation.task.projectanalysis.duplication.DuplicationRepository; +import org.sonar.server.computation.task.projectanalysis.duplication.InProjectDuplicate; +import org.sonar.server.computation.task.projectanalysis.duplication.InnerDuplicate; +import org.sonar.server.computation.task.projectanalysis.duplication.TextBlock; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.Iterables.isEmpty; import static org.sonar.api.measures.CoreMetrics.DUPLICATIONS_DATA_KEY; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; /** * Compute duplication data measures on files, based on the {@link DuplicationRepository} diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/DuplicationMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationMeasuresStep.java similarity index 86% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/DuplicationMeasuresStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationMeasuresStep.java index aa040ad38ee..514c2c4145f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/DuplicationMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationMeasuresStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; @@ -26,22 +26,23 @@ import java.util.Set; import javax.annotation.CheckForNull; import javax.annotation.Nullable; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.PathAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.duplication.Duplication; -import org.sonar.server.computation.duplication.DuplicationRepository; -import org.sonar.server.computation.duplication.InnerDuplicate; -import org.sonar.server.computation.duplication.TextBlock; -import org.sonar.server.computation.formula.Counter; -import org.sonar.server.computation.formula.CounterInitializationContext; -import org.sonar.server.computation.formula.CreateMeasureContext; -import org.sonar.server.computation.formula.Formula; -import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.duplication.Duplication; +import org.sonar.server.computation.task.projectanalysis.duplication.DuplicationRepository; +import org.sonar.server.computation.task.projectanalysis.duplication.InnerDuplicate; +import org.sonar.server.computation.task.projectanalysis.duplication.TextBlock; +import org.sonar.server.computation.task.projectanalysis.formula.Counter; +import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.server.computation.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.server.computation.task.projectanalysis.formula.Formula; +import org.sonar.server.computation.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.FluentIterable.from; import static com.google.common.collect.Iterables.isEmpty; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/EnableAnalysisStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStep.java similarity index 83% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/EnableAnalysisStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStep.java index 708f7706d76..52e9397c571 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/EnableAnalysisStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStep.java @@ -17,14 +17,15 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.MyBatis; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.step.ComputationStep; public class EnableAnalysisStep implements ComputationStep { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ExecuteVisitorsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStep.java similarity index 85% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/ExecuteVisitorsStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStep.java index 21accfc227c..7257fc46c38 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ExecuteVisitorsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStep.java @@ -17,15 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.util.List; import java.util.Map; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.server.computation.component.ComponentVisitor; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.VisitorsCrawler; +import org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.VisitorsCrawler; +import org.sonar.server.computation.task.step.ComputationStep; public class ExecuteVisitorsStep implements ComputationStep { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ExtractReportStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStep.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/ExtractReportStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStep.java index 959926289ef..566e3afeca4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ExtractReportStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.io.File; import java.io.IOException; @@ -28,7 +28,8 @@ import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.ce.queue.CeTask; import org.sonar.ce.queue.report.ReportFiles; -import org.sonar.server.computation.batch.MutableBatchReportDirectoryHolder; +import org.sonar.server.computation.task.projectanalysis.batch.MutableBatchReportDirectoryHolder; +import org.sonar.server.computation.task.step.ComputationStep; /** * Extracts the content zip file of the {@link CeTask} to a temp directory and adds a {@link File} diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/GenerateAnalysisUuid.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/GenerateAnalysisUuid.java similarity index 86% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/GenerateAnalysisUuid.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/GenerateAnalysisUuid.java index 2140b9e4748..a9522cfc935 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/GenerateAnalysisUuid.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/GenerateAnalysisUuid.java @@ -17,10 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.sonar.core.util.UuidFactory; -import org.sonar.server.computation.analysis.MutableAnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.analysis.MutableAnalysisMetadataHolder; +import org.sonar.server.computation.task.step.ComputationStep; public class GenerateAnalysisUuid implements ComputationStep { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexComponentsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/IndexComponentsStep.java similarity index 87% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexComponentsStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/IndexComponentsStep.java index b2ce8801129..f1b70a87cc0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexComponentsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/IndexComponentsStep.java @@ -17,10 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.sonar.db.component.ResourceIndexDao; -import org.sonar.server.computation.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.step.ComputationStep; /** * Components are currently indexed in db table RESOURCE_INDEX, not in Elasticsearch diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexIssuesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/IndexIssuesStep.java similarity index 86% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexIssuesStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/IndexIssuesStep.java index d95449c16e0..065ceba8667 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexIssuesStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/IndexIssuesStep.java @@ -17,9 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; -import org.sonar.server.computation.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.issue.index.IssueIndexer; public class IndexIssuesStep implements ComputationStep { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexTestsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/IndexTestsStep.java similarity index 86% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexTestsStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/IndexTestsStep.java index 59566494c63..32ca43eb076 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexTestsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/IndexTestsStep.java @@ -17,9 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; -import org.sonar.server.computation.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.test.index.TestIndexer; public class IndexTestsStep implements ComputationStep { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LanguageDistributionMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LanguageDistributionMeasuresStep.java similarity index 81% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/LanguageDistributionMeasuresStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LanguageDistributionMeasuresStep.java index da2037a31b4..6021a52efba 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LanguageDistributionMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LanguageDistributionMeasuresStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -29,24 +29,25 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.utils.KeyValueFormat; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.PathAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.formula.Counter; -import org.sonar.server.computation.formula.CounterInitializationContext; -import org.sonar.server.computation.formula.CreateMeasureContext; -import org.sonar.server.computation.formula.Formula; -import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.formula.Counter; +import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.server.computation.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.server.computation.task.projectanalysis.formula.Formula; +import org.sonar.server.computation.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.Maps.asMap; import static org.sonar.api.measures.CoreMetrics.NCLOC_LANGUAGE_DISTRIBUTION_KEY; import static org.sonar.api.utils.KeyValueFormat.format; import static org.sonar.api.utils.KeyValueFormat.newIntegerConverter; import static org.sonar.api.utils.KeyValueFormat.newStringConverter; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; public class LanguageDistributionMeasuresStep implements ComputationStep { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadCrossProjectDuplicationsRepositoryStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStep.java similarity index 85% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadCrossProjectDuplicationsRepositoryStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStep.java index 7d7aa77de57..d88d433edee 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadCrossProjectDuplicationsRepositoryStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Function; import java.util.Collection; @@ -31,20 +31,21 @@ import org.sonar.db.duplication.DuplicationUnitDto; import org.sonar.duplications.block.Block; import org.sonar.duplications.block.ByteArray; import org.sonar.scanner.protocol.output.ScannerReport.CpdTextBlock; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.batch.BatchReportReader; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; -import org.sonar.server.computation.duplication.CrossProjectDuplicationStatusHolder; -import org.sonar.server.computation.duplication.IntegrateCrossProjectDuplications; -import org.sonar.server.computation.analysis.Analysis; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.duplication.CrossProjectDuplicationStatusHolder; +import org.sonar.server.computation.task.projectanalysis.duplication.IntegrateCrossProjectDuplications; +import org.sonar.server.computation.task.projectanalysis.analysis.Analysis; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.FluentIterable.from; import static com.google.common.collect.Lists.newArrayList; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; /** * Feed the duplications repository from the cross project duplication blocks computed with duplications blocks of the analysis report. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadDuplicationsFromReportStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStep.java similarity index 74% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadDuplicationsFromReportStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStep.java index ba24979f136..e4dc427dc86 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadDuplicationsFromReportStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStep.java @@ -17,29 +17,30 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Function; import javax.annotation.Nonnull; import org.sonar.core.util.CloseableIterator; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.batch.BatchReportReader; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; -import org.sonar.server.computation.duplication.DetailedTextBlock; -import org.sonar.server.computation.duplication.Duplicate; -import org.sonar.server.computation.duplication.Duplication; -import org.sonar.server.computation.duplication.DuplicationRepository; -import org.sonar.server.computation.duplication.InProjectDuplicate; -import org.sonar.server.computation.duplication.InnerDuplicate; -import org.sonar.server.computation.duplication.TextBlock; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.duplication.DetailedTextBlock; +import org.sonar.server.computation.task.projectanalysis.duplication.Duplicate; +import org.sonar.server.computation.task.projectanalysis.duplication.Duplication; +import org.sonar.server.computation.task.projectanalysis.duplication.DuplicationRepository; +import org.sonar.server.computation.task.projectanalysis.duplication.InProjectDuplicate; +import org.sonar.server.computation.task.projectanalysis.duplication.InnerDuplicate; +import org.sonar.server.computation.task.projectanalysis.duplication.TextBlock; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.FluentIterable.from; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; /** * Loads duplication information from the report and loads them into the {@link DuplicationRepository}. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadMeasureComputersStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStep.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadMeasureComputersStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStep.java index 17fa3b2f3a2..5c5b8b40d82 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadMeasureComputersStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -36,9 +36,10 @@ import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Metric; import org.sonar.api.measures.Metrics; import org.sonar.api.utils.dag.DirectAcyclicGraph; -import org.sonar.server.computation.measure.MutableMeasureComputersHolder; -import org.sonar.server.computation.measure.api.MeasureComputerDefinitionImpl; -import org.sonar.server.computation.measure.api.MeasureComputerWrapper; +import org.sonar.server.computation.task.projectanalysis.measure.MutableMeasureComputersHolder; +import org.sonar.server.computation.task.projectanalysis.api.measurecomputer.MeasureComputerDefinitionImpl; +import org.sonar.server.computation.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.FluentIterable.from; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadPeriodsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStep.java similarity index 75% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadPeriodsStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStep.java index 138895e63d9..c404f6763d3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadPeriodsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Optional; import java.util.ArrayList; @@ -28,22 +28,23 @@ import org.sonar.api.resources.Qualifiers; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.component.ComponentDto; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.SettingsRepository; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolderImpl; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.SettingsRepository; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolderImpl; +import org.sonar.server.computation.task.step.ComputationStep; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; -import static org.sonar.server.computation.component.CrawlerDepthLimit.reportMaxDepth; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit.reportMaxDepth; /** - * Populates the {@link org.sonar.server.computation.period.PeriodsHolder} + * Populates the {@link org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder} *

* Here is how these periods are computed : * - Read the 5 period properties ${@link org.sonar.core.config.CorePropertyDefinitions#TIMEMACHINE_PERIOD_PREFIX} diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadQualityGateStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityGateStep.java similarity index 76% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadQualityGateStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityGateStep.java index 4b962c25efd..3cc50c4191b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadQualityGateStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityGateStep.java @@ -17,24 +17,25 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Optional; import org.apache.commons.lang.StringUtils; import org.sonar.api.config.Settings; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.SettingsRepository; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; -import org.sonar.server.computation.qualitygate.MutableQualityGateHolder; -import org.sonar.server.computation.qualitygate.QualityGate; -import org.sonar.server.computation.qualitygate.QualityGateService; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.SettingsRepository; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.qualitygate.MutableQualityGateHolder; +import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGate; +import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateService; +import org.sonar.server.computation.task.step.ComputationStep; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; /** * This step retrieves the QualityGate and stores it in diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadQualityProfilesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStep.java similarity index 84% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadQualityProfilesStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStep.java index 711079cde1d..d406db99305 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadQualityProfilesStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Optional; import com.google.common.base.Predicate; @@ -30,11 +30,12 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.core.util.CloseableIterator; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.batch.BatchReportReader; -import org.sonar.server.computation.issue.Rule; -import org.sonar.server.computation.issue.RuleRepository; -import org.sonar.server.computation.qualityprofile.ActiveRule; -import org.sonar.server.computation.qualityprofile.ActiveRulesHolderImpl; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.server.computation.task.projectanalysis.issue.Rule; +import org.sonar.server.computation.task.projectanalysis.issue.RuleRepository; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolderImpl; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.FluentIterable.from; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadReportAnalysisMetadataHolderStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadReportAnalysisMetadataHolderStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java index ec74ba5ff2b..086a4021d89 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadReportAnalysisMetadataHolderStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Function; import java.util.Date; @@ -25,9 +25,10 @@ import org.sonar.api.utils.MessageException; import org.sonar.ce.queue.CeTask; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.Metadata.QProfile; -import org.sonar.server.computation.analysis.MutableAnalysisMetadataHolder; -import org.sonar.server.computation.batch.BatchReportReader; -import org.sonar.server.computation.qualityprofile.QualityProfile; +import org.sonar.server.computation.task.projectanalysis.analysis.MutableAnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.QualityProfile; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.Maps.transformValues; import static java.lang.String.format; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LogScannerContextStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LogScannerContextStep.java similarity index 88% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/LogScannerContextStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LogScannerContextStep.java index 45e18f7e6eb..863b928d219 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LogScannerContextStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LogScannerContextStep.java @@ -17,12 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.core.util.CloseableIterator; -import org.sonar.server.computation.batch.BatchReportReader; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.server.computation.task.step.ComputationStep; public class LogScannerContextStep implements ComputationStep { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/NewCoverageMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewCoverageMeasuresStep.java similarity index 88% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/NewCoverageMeasuresStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewCoverageMeasuresStep.java index 1450ee04dee..299cea60b21 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/NewCoverageMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewCoverageMeasuresStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; @@ -31,32 +31,33 @@ import javax.annotation.concurrent.Immutable; import org.apache.commons.lang.ObjectUtils; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.utils.KeyValueFormat; -import org.sonar.server.computation.batch.BatchReportReader; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.PathAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.formula.CounterInitializationContext; -import org.sonar.server.computation.formula.CreateMeasureContext; -import org.sonar.server.computation.formula.Formula; -import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor; -import org.sonar.server.computation.formula.VariationSumFormula; -import org.sonar.server.computation.formula.counter.IntVariationValue; -import org.sonar.server.computation.formula.coverage.LinesAndConditionsWithUncoveredMetricKeys; -import org.sonar.server.computation.formula.coverage.LinesAndConditionsWithUncoveredVariationFormula; -import org.sonar.server.computation.formula.coverage.SingleWithUncoveredMetricKeys; -import org.sonar.server.computation.formula.coverage.SingleWithUncoveredVariationFormula; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolder; -import org.sonar.server.computation.scm.ScmInfo; -import org.sonar.server.computation.scm.ScmInfoRepository; - -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.period.PeriodPredicates.viewsRestrictedPeriods; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.server.computation.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.server.computation.task.projectanalysis.formula.Formula; +import org.sonar.server.computation.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.formula.VariationSumFormula; +import org.sonar.server.computation.task.projectanalysis.formula.counter.IntVariationValue; +import org.sonar.server.computation.task.projectanalysis.formula.coverage.LinesAndConditionsWithUncoveredMetricKeys; +import org.sonar.server.computation.task.projectanalysis.formula.coverage.LinesAndConditionsWithUncoveredVariationFormula; +import org.sonar.server.computation.task.projectanalysis.formula.coverage.SingleWithUncoveredMetricKeys; +import org.sonar.server.computation.task.projectanalysis.formula.coverage.SingleWithUncoveredVariationFormula; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.scm.ScmInfo; +import org.sonar.server.computation.task.projectanalysis.scm.ScmInfoRepository; +import org.sonar.server.computation.task.step.ComputationStep; + +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.period.PeriodPredicates.viewsRestrictedPeriods; /** * Computes measures related to the New Coverage. These measures do not have values, only variations. @@ -275,7 +276,7 @@ public class NewCoverageMeasuresStep implements ComputationStep { } /** - * Creates a List of {@link org.sonar.server.computation.formula.SumFormula.IntSumFormula} for each + * Creates a List of {@link org.sonar.server.computation.task.projectanalysis.formula.SumFormula.IntSumFormula} for each * metric key of the specified {@link NewCoverageOutputMetricKeys} instance. */ private static Iterable> variationSumFormulas(NewCoverageOutputMetricKeys outputMetricKeys) { @@ -344,7 +345,7 @@ public class NewCoverageMeasuresStep implements ComputationStep { } } - public static final class NewCoverageCounter implements org.sonar.server.computation.formula.Counter { + public static final class NewCoverageCounter implements org.sonar.server.computation.task.projectanalysis.formula.Counter { private final IntVariationValue.Array newLines = IntVariationValue.newArray(); private final IntVariationValue.Array newCoveredLines = IntVariationValue.newArray(); private final IntVariationValue.Array newConditions = IntVariationValue.newArray(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PeriodResolver.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PeriodResolver.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/PeriodResolver.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PeriodResolver.java index 85a3afe98a5..99cda50ab7c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PeriodResolver.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PeriodResolver.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Strings; import java.time.temporal.ChronoUnit; @@ -34,7 +34,7 @@ import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.component.SnapshotDto; import org.sonar.db.component.SnapshotQuery; -import org.sonar.server.computation.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.Period; import static org.sonar.core.config.CorePropertyDefinitions.TIMEMACHINE_MODE_DATE; import static org.sonar.core.config.CorePropertyDefinitions.TIMEMACHINE_MODE_DAYS; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistAnalysisStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistAnalysisStep.java similarity index 87% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistAnalysisStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistAnalysisStep.java index 11b948d8260..3ec87d2f3d7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistAnalysisStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistAnalysisStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import javax.annotation.CheckForNull; import javax.annotation.Nullable; @@ -25,14 +25,15 @@ import org.sonar.api.utils.System2; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.component.SnapshotDto; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.PathAwareCrawler; -import org.sonar.server.computation.component.PathAwareVisitorAdapter; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; +import org.sonar.server.computation.task.step.ComputationStep; /** * Persist analysis diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStep.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentsStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStep.java index e096849ab81..31de0218bdb 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Predicate; import java.util.Collection; @@ -37,20 +37,21 @@ import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentUpdateDto; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.DbIdsRepositoryImpl; -import org.sonar.server.computation.component.MutableDbIdsRepository; -import org.sonar.server.computation.component.MutableDisabledComponentsHolder; -import org.sonar.server.computation.component.PathAwareCrawler; -import org.sonar.server.computation.component.PathAwareVisitor; -import org.sonar.server.computation.component.PathAwareVisitorAdapter; -import org.sonar.server.computation.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.DbIdsRepositoryImpl; +import org.sonar.server.computation.task.projectanalysis.component.MutableDbIdsRepository; +import org.sonar.server.computation.task.projectanalysis.component.MutableDisabledComponentsHolder; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareVisitor; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.FluentIterable.from; import static org.sonar.db.component.ComponentDto.UUID_PATH_SEPARATOR; import static org.sonar.db.component.ComponentDto.formatUuidPathFromParent; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; /** * Persist report components diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistCrossProjectDuplicationIndexStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java similarity index 80% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistCrossProjectDuplicationIndexStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java index 5ed6136e9c6..c1c28f6f59c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistCrossProjectDuplicationIndexStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java @@ -17,23 +17,24 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.sonar.core.util.CloseableIterator; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.duplication.DuplicationUnitDto; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.batch.BatchReportReader; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; -import org.sonar.server.computation.duplication.CrossProjectDuplicationStatusHolder; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.duplication.CrossProjectDuplicationStatusHolder; +import org.sonar.server.computation.task.step.ComputationStep; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; /** * Persist cross project duplications text blocks into DUPLICATIONS_INDEX table diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDevelopersStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistDevelopersStep.java similarity index 86% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDevelopersStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistDevelopersStep.java index 24ee34ab3a9..d8e79ec2240 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDevelopersStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistDevelopersStep.java @@ -17,9 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; -import org.sonar.server.computation.developer.PersistDevelopersDelegate; +import org.sonar.server.computation.task.projectanalysis.api.developer.PersistDevelopersDelegate; +import org.sonar.server.computation.task.step.ComputationStep; /** * Persist developers, should only be execute when the Dev Cockpit plugin is installed. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStep.java similarity index 84% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStep.java index 08eca3e5205..3ede645767a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Function; import org.sonar.api.utils.System2; @@ -25,15 +25,16 @@ import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.MyBatis; import org.sonar.db.event.EventDto; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ComponentVisitor; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; -import org.sonar.server.computation.event.Event; -import org.sonar.server.computation.event.EventRepository; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.event.Event; +import org.sonar.server.computation.task.projectanalysis.event.EventRepository; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.Iterables.transform; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStep.java similarity index 83% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStep.java index 074546d588f..91c83919b24 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; @@ -40,27 +40,28 @@ import org.sonar.db.protobuf.DbFileSources; import org.sonar.db.source.FileSourceDto; import org.sonar.db.source.FileSourceDto.Type; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.batch.BatchReportReader; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; -import org.sonar.server.computation.duplication.DuplicationRepository; -import org.sonar.server.computation.scm.Changeset; -import org.sonar.server.computation.scm.ScmInfo; -import org.sonar.server.computation.scm.ScmInfoRepository; -import org.sonar.server.computation.source.ComputeFileSourceData; -import org.sonar.server.computation.source.CoverageLineReader; -import org.sonar.server.computation.source.DuplicationLineReader; -import org.sonar.server.computation.source.HighlightingLineReader; -import org.sonar.server.computation.source.LineReader; -import org.sonar.server.computation.source.RangeOffsetConverter; -import org.sonar.server.computation.source.ScmLineReader; -import org.sonar.server.computation.source.SourceLinesRepository; -import org.sonar.server.computation.source.SymbolsLineReader; - -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.duplication.DuplicationRepository; +import org.sonar.server.computation.task.projectanalysis.scm.Changeset; +import org.sonar.server.computation.task.projectanalysis.scm.ScmInfo; +import org.sonar.server.computation.task.projectanalysis.scm.ScmInfoRepository; +import org.sonar.server.computation.task.projectanalysis.source.ComputeFileSourceData; +import org.sonar.server.computation.task.projectanalysis.source.CoverageLineReader; +import org.sonar.server.computation.task.projectanalysis.source.DuplicationLineReader; +import org.sonar.server.computation.task.projectanalysis.source.HighlightingLineReader; +import org.sonar.server.computation.task.projectanalysis.source.LineReader; +import org.sonar.server.computation.task.projectanalysis.source.RangeOffsetConverter; +import org.sonar.server.computation.task.projectanalysis.source.ScmLineReader; +import org.sonar.server.computation.task.projectanalysis.source.SourceLinesRepository; +import org.sonar.server.computation.task.projectanalysis.source.SymbolsLineReader; +import org.sonar.server.computation.task.step.ComputationStep; + +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class PersistFileSourcesStep implements ComputationStep { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStep.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStep.java index bc33b0bd801..ed708af42a1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.sonar.api.issue.IssueComment; import org.sonar.api.utils.System2; @@ -28,13 +28,14 @@ import org.sonar.db.issue.IssueChangeDto; import org.sonar.db.issue.IssueChangeMapper; import org.sonar.db.issue.IssueDto; import org.sonar.db.issue.IssueMapper; -import org.sonar.server.computation.issue.UpdateConflictResolver; +import org.sonar.server.computation.task.projectanalysis.issue.UpdateConflictResolver; import org.sonar.db.DbSession; import org.sonar.db.MyBatis; -import org.sonar.server.computation.issue.IssueCache; -import org.sonar.server.computation.issue.RuleRepository; +import org.sonar.server.computation.task.projectanalysis.issue.IssueCache; +import org.sonar.server.computation.task.projectanalysis.issue.RuleRepository; import org.sonar.db.DbClient; import org.sonar.core.util.CloseableIterator; +import org.sonar.server.computation.task.step.ComputationStep; public class PersistIssuesStep implements ComputationStep { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStep.java similarity index 80% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStep.java index 205c003786d..5eabcd82ccf 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -31,23 +31,24 @@ import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.measure.MeasureDao; import org.sonar.db.measure.MeasureDto; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; -import org.sonar.server.computation.measure.BestValueOptimization; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.measure.MeasureToMeasureDto; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.measure.BestValueOptimization; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureToMeasureDto; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.FluentIterable.from; import static org.sonar.api.measures.CoreMetrics.CLASS_COMPLEXITY_DISTRIBUTION_KEY; import static org.sonar.api.measures.CoreMetrics.FILE_COMPLEXITY_DISTRIBUTION_KEY; import static org.sonar.api.measures.CoreMetrics.FUNCTION_COMPLEXITY_DISTRIBUTION_KEY; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class PersistMeasuresStep implements ComputationStep { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStep.java similarity index 88% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStep.java index d6342d40ec9..403aecf24fa 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; @@ -34,15 +34,16 @@ import org.sonar.db.MyBatis; import org.sonar.db.component.ComponentLinkDto; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.ComponentLink.ComponentLinkType; -import org.sonar.server.computation.batch.BatchReportReader; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.Sets.newHashSet; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; /** * Persist project and module links diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStep.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStep.java index 8e63a314672..2f4925cd134 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Joiner; import com.google.common.collect.ArrayListMultimap; @@ -47,13 +47,14 @@ import org.sonar.db.source.FileSourceDto; import org.sonar.db.source.FileSourceDto.Type; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.Test.TestStatus; -import org.sonar.server.computation.batch.BatchReportReader; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ComponentVisitor; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.step.ComputationStep; public class PersistTestsStep implements ComputationStep { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PublishTaskResultStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStep.java similarity index 90% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/PublishTaskResultStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStep.java index c2046483aa4..a2ae7ef5b52 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PublishTaskResultStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStep.java @@ -17,12 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.util.Optional; import javax.annotation.concurrent.Immutable; import org.sonar.ce.queue.CeTaskResult; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.computation.taskprocessor.MutableTaskResultHolder; public class PublishTaskResultStep implements ComputationStep { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStep.java similarity index 70% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStep.java index f9dd5dfaa85..3f4d9a29aa9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStep.java @@ -17,24 +17,25 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.purge.IdUuidPair; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.DbIdsRepository; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.DisabledComponentsHolder; -import org.sonar.server.computation.component.SettingsRepository; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.DbIdsRepository; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.DisabledComponentsHolder; +import org.sonar.server.computation.task.projectanalysis.component.SettingsRepository; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; import org.sonar.server.computation.dbcleaner.ProjectCleaner; +import org.sonar.server.computation.task.step.ComputationStep; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; -import static org.sonar.server.computation.component.CrawlerDepthLimit.reportMaxDepth; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit.reportMaxDepth; public class PurgeDatastoresStep implements ComputationStep { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateEventsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStep.java similarity index 81% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateEventsStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStep.java index f823ac73c09..dd2abaad169 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateEventsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Optional; import javax.annotation.Nullable; @@ -25,19 +25,20 @@ import org.sonar.api.measures.CoreMetrics; import org.sonar.api.notifications.Notification; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ComponentVisitor; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; -import org.sonar.server.computation.event.Event; -import org.sonar.server.computation.event.EventRepository; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.measure.QualityGateStatus; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.event.Event; +import org.sonar.server.computation.task.projectanalysis.event.EventRepository; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.measure.QualityGateStatus; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.notification.NotificationService; /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStep.java similarity index 80% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateMeasuresStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStep.java index 5f9dca9b7e2..e377f1d1d78 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -33,32 +33,33 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.apache.commons.lang.StringUtils; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.measure.QualityGateStatus; -import org.sonar.server.computation.measure.qualitygatedetails.EvaluatedCondition; -import org.sonar.server.computation.measure.qualitygatedetails.QualityGateDetailsData; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.qualitygate.Condition; -import org.sonar.server.computation.qualitygate.ConditionEvaluator; -import org.sonar.server.computation.qualitygate.ConditionStatus; -import org.sonar.server.computation.qualitygate.EvaluationResult; -import org.sonar.server.computation.qualitygate.EvaluationResultTextConverter; -import org.sonar.server.computation.qualitygate.MutableQualityGateStatusHolder; -import org.sonar.server.computation.qualitygate.QualityGate; -import org.sonar.server.computation.qualitygate.QualityGateHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.measure.QualityGateStatus; +import org.sonar.server.computation.task.projectanalysis.measure.qualitygatedetails.EvaluatedCondition; +import org.sonar.server.computation.task.projectanalysis.measure.qualitygatedetails.QualityGateDetailsData; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.qualitygate.Condition; +import org.sonar.server.computation.task.projectanalysis.qualitygate.ConditionEvaluator; +import org.sonar.server.computation.task.projectanalysis.qualitygate.ConditionStatus; +import org.sonar.server.computation.task.projectanalysis.qualitygate.EvaluationResult; +import org.sonar.server.computation.task.projectanalysis.qualitygate.EvaluationResultTextConverter; +import org.sonar.server.computation.task.projectanalysis.qualitygate.MutableQualityGateStatusHolder; +import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGate; +import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateHolder; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.FluentIterable.from; import static java.lang.String.format; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; -import static org.sonar.server.computation.qualitygate.ConditionStatus.NO_VALUE_STATUS; -import static org.sonar.server.computation.qualitygate.ConditionStatus.create; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.qualitygate.ConditionStatus.NO_VALUE_STATUS; +import static org.sonar.server.computation.task.projectanalysis.qualitygate.ConditionStatus.create; /** * This step: @@ -136,14 +137,14 @@ public class QualityGateMeasuresStep implements ComputationStep { } } - private static org.sonar.server.computation.qualitygate.QualityGateStatus convert(Measure.Level globalLevel) { + private static org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateStatus convert(Measure.Level globalLevel) { switch (globalLevel) { case OK: - return org.sonar.server.computation.qualitygate.QualityGateStatus.OK; + return org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateStatus.OK; case WARN: - return org.sonar.server.computation.qualitygate.QualityGateStatus.WARN; + return org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateStatus.WARN; case ERROR: - return org.sonar.server.computation.qualitygate.QualityGateStatus.ERROR; + return org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateStatus.ERROR; default: throw new IllegalArgumentException(format( "Unsupported value '%s' of Measure.Level can not be converted to QualityGateStatus", diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityProfileEventsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStep.java similarity index 82% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityProfileEventsStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStep.java index 674883f3d12..d4cd6212030 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityProfileEventsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSortedMap; @@ -30,21 +30,22 @@ import org.sonar.api.measures.CoreMetrics; import org.sonar.api.resources.Language; import org.sonar.api.utils.KeyValueFormat; import org.sonar.core.util.UtcDateUtils; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; -import org.sonar.server.computation.event.Event; -import org.sonar.server.computation.event.EventRepository; -import org.sonar.server.computation.language.LanguageRepository; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.qualityprofile.QPMeasureData; -import org.sonar.server.computation.qualityprofile.QualityProfile; - -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.event.Event; +import org.sonar.server.computation.task.projectanalysis.event.EventRepository; +import org.sonar.server.computation.task.projectanalysis.language.LanguageRepository; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.QPMeasureData; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.QualityProfile; +import org.sonar.server.computation.task.step.ComputationStep; + +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; /** * Computation of quality profile events diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ReportComputationSteps.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationSteps.java similarity index 82% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/ReportComputationSteps.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationSteps.java index 1f183b51e30..eed8275241d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ReportComputationSteps.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationSteps.java @@ -17,16 +17,17 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Predicate; import java.util.Arrays; import java.util.List; import javax.annotation.Nonnull; import org.picocontainer.ComponentAdapter; -import org.sonar.server.computation.container.ComputeEngineContainer; -import org.sonar.server.computation.developer.PersistDevelopersDelegate; -import org.sonar.server.computation.filemove.FileMoveDetectionStep; +import org.sonar.server.computation.task.container.TaskContainer; +import org.sonar.server.computation.task.projectanalysis.api.developer.PersistDevelopersDelegate; +import org.sonar.server.computation.task.projectanalysis.filemove.FileMoveDetectionStep; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.FluentIterable.from; @@ -111,33 +112,33 @@ public class ReportComputationSteps extends AbstractComputationSteps { PublishTaskResultStep.class); - private final ComputeEngineContainer computeEngineContainer; + private final TaskContainer taskContainer; - public ReportComputationSteps(ComputeEngineContainer computeEngineContainer) { - super(computeEngineContainer); - this.computeEngineContainer = computeEngineContainer; + public ReportComputationSteps(TaskContainer taskContainer) { + super(taskContainer); + this.taskContainer = taskContainer; } /** - * List of all {@link org.sonar.server.computation.step.ComputationStep}, + * List of all {@link ComputationStep}, * ordered by execution sequence. */ @Override public List> orderedStepClasses() { return from(STEPS) - .filter(new AllowPersistDevelopersStepIfDevCockpitPluginInstalled(computeEngineContainer)) + .filter(new AllowPersistDevelopersStepIfDevCockpitPluginInstalled(taskContainer)) .toList(); } private static class AllowPersistDevelopersStepIfDevCockpitPluginInstalled implements Predicate> { private final boolean devCockpitIsInstalled; - private AllowPersistDevelopersStepIfDevCockpitPluginInstalled(ComputeEngineContainer computeEngineContainer) { - this.devCockpitIsInstalled = isDevCockpitInstalled(computeEngineContainer); + private AllowPersistDevelopersStepIfDevCockpitPluginInstalled(TaskContainer taskContainer) { + this.devCockpitIsInstalled = isDevCockpitInstalled(taskContainer); } - private static boolean isDevCockpitInstalled(ComputeEngineContainer computeEngineContainer) { - List> componentAdapters = computeEngineContainer.getPicoContainer().getComponentAdapters(PersistDevelopersDelegate.class); + private static boolean isDevCockpitInstalled(TaskContainer taskContainer) { + List> componentAdapters = taskContainer.getPicoContainer().getComponentAdapters(PersistDevelopersDelegate.class); return !componentAdapters.isEmpty(); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SendIssueNotificationsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStep.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/SendIssueNotificationsStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStep.java index 23f85bfd3e3..dfecd9b67ae 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SendIssueNotificationsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.collect.ImmutableSet; import java.util.Date; @@ -25,11 +25,12 @@ import java.util.Map; import java.util.Set; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.util.CloseableIterator; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.issue.IssueCache; -import org.sonar.server.computation.issue.RuleRepository; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.issue.IssueCache; +import org.sonar.server.computation.task.projectanalysis.issue.RuleRepository; +import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.issue.notification.IssueChangeNotification; import org.sonar.server.issue.notification.MyNewIssuesNotification; import org.sonar.server.issue.notification.NewIssuesNotification; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SizeMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SizeMeasuresStep.java similarity index 82% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/SizeMeasuresStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SizeMeasuresStep.java index afcf7eef084..3f506e87b68 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SizeMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SizeMeasuresStep.java @@ -17,23 +17,24 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import java.util.List; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.PathAwareCrawler; -import org.sonar.server.computation.component.PathAwareVisitorAdapter; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.formula.Formula; -import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.formula.Formula; +import org.sonar.server.computation.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.step.ComputationStep; import static org.sonar.api.measures.CoreMetrics.ACCESSORS_KEY; import static org.sonar.api.measures.CoreMetrics.CLASSES_KEY; @@ -43,9 +44,9 @@ import static org.sonar.api.measures.CoreMetrics.GENERATED_NCLOC_KEY; import static org.sonar.api.measures.CoreMetrics.LINES_KEY; import static org.sonar.api.measures.CoreMetrics.NCLOC_KEY; import static org.sonar.api.measures.CoreMetrics.STATEMENTS_KEY; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; -import static org.sonar.server.computation.formula.SumFormula.createIntSumFormula; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.formula.SumFormula.createIntSumFormula; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; /** * Compute size measures diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/UnitTestMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UnitTestMeasuresStep.java similarity index 80% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/UnitTestMeasuresStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UnitTestMeasuresStep.java index a7d4af584a2..c4b85deb500 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/UnitTestMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UnitTestMeasuresStep.java @@ -17,23 +17,24 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.PathAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.formula.Counter; -import org.sonar.server.computation.formula.CounterInitializationContext; -import org.sonar.server.computation.formula.CreateMeasureContext; -import org.sonar.server.computation.formula.Formula; -import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor; -import org.sonar.server.computation.formula.counter.IntSumCounter; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.formula.Counter; +import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.server.computation.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.server.computation.task.projectanalysis.formula.Formula; +import org.sonar.server.computation.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.formula.counter.IntSumCounter; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.step.ComputationStep; import static org.sonar.api.measures.CoreMetrics.SKIPPED_TESTS_KEY; import static org.sonar.api.measures.CoreMetrics.TESTS_KEY; @@ -41,8 +42,8 @@ import static org.sonar.api.measures.CoreMetrics.TEST_ERRORS_KEY; import static org.sonar.api.measures.CoreMetrics.TEST_EXECUTION_TIME_KEY; import static org.sonar.api.measures.CoreMetrics.TEST_FAILURES_KEY; import static org.sonar.api.measures.CoreMetrics.TEST_SUCCESS_DENSITY_KEY; -import static org.sonar.server.computation.formula.SumFormula.createIntSumFormula; -import static org.sonar.server.computation.formula.SumFormula.createLongSumFormula; +import static org.sonar.server.computation.task.projectanalysis.formula.SumFormula.createIntSumFormula; +import static org.sonar.server.computation.task.projectanalysis.formula.SumFormula.createLongSumFormula; /** * Computes unit test measures on files and then aggregates them on higher components. diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/UpdateQualityProfilesLastUsedDateStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStep.java similarity index 82% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/UpdateQualityProfilesLastUsedDateStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStep.java index fb027ffe715..c412ef73b71 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/UpdateQualityProfilesLastUsedDateStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStep.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Optional; import java.util.ArrayList; @@ -28,15 +28,16 @@ import java.util.stream.Collectors; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.qualityprofile.QualityProfileDto; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.qualityprofile.QPMeasureData; -import org.sonar.server.computation.qualityprofile.QualityProfile; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.QPMeasureData; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.QualityProfile; +import org.sonar.server.computation.task.step.ComputationStep; import static java.util.Collections.emptySet; import static org.sonar.api.measures.CoreMetrics.QUALITY_PROFILES_KEY; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ValidateProjectStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStep.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/ValidateProjectStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStep.java index 5379ffee18f..78bfa76f1ee 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ValidateProjectStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStep.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Joiner; import com.google.common.base.Optional; @@ -34,14 +34,15 @@ import org.sonar.db.DbSession; import org.sonar.db.component.ComponentDao; import org.sonar.db.component.ComponentDto; import org.sonar.db.component.SnapshotDto; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.batch.BatchReportReader; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ComponentVisitor; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.FluentIterable.from; import static java.lang.String.format; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/package-info.java new file mode 100644 index 00000000000..d76d40ae916 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.step; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/report/ReportTaskProcessor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/ReportTaskProcessor.java similarity index 86% rename from server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/report/ReportTaskProcessor.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/ReportTaskProcessor.java index ece726d9ea7..8668ad9964c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/report/ReportTaskProcessor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/ReportTaskProcessor.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.taskprocessor.report; +package org.sonar.server.computation.task.projectanalysis.taskprocessor; import java.util.Collections; import java.util.Set; @@ -30,9 +30,9 @@ import org.sonar.ce.taskprocessor.CeTaskProcessor; import org.sonar.core.platform.ComponentContainer; import org.sonar.db.ce.CeTaskTypes; import org.sonar.plugin.ce.ReportAnalysisComponentProvider; -import org.sonar.server.computation.container.ComputeEngineContainer; -import org.sonar.server.computation.container.ContainerFactory; -import org.sonar.server.computation.step.ComputationStepExecutor; +import org.sonar.server.computation.task.container.TaskContainer; +import org.sonar.server.computation.task.projectanalysis.container.ContainerFactory; +import org.sonar.server.computation.task.step.ComputationStepExecutor; import org.sonar.server.computation.taskprocessor.TaskResultHolder; public class ReportTaskProcessor implements CeTaskProcessor { @@ -69,7 +69,7 @@ public class ReportTaskProcessor implements CeTaskProcessor { @Override public CeTaskResult process(CeTask task) { - ComputeEngineContainer ceContainer = containerFactory.create(serverContainer, task, componentProviders); + TaskContainer ceContainer = containerFactory.create(serverContainer, task, componentProviders); try { ceContainer.getComponentByType(ComputationStepExecutor.class).execute(); @@ -82,7 +82,7 @@ public class ReportTaskProcessor implements CeTaskProcessor { } /** safety call to clear ThreadLocal even if Pico container fails to call {@link SettingsLoader#stop()}) */ - private static void ensureThreadLocalIsClean(ComputeEngineContainer ceContainer) { + private static void ensureThreadLocalIsClean(TaskContainer ceContainer) { ceContainer.getComponentByType(ThreadLocalSettings.class).unload(); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/package-info.java new file mode 100644 index 00000000000..bacafed0954 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.computation.task.projectanalysis.taskprocessor; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStep.java similarity index 88% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStep.java index 7fd49b832dc..3e2cb15af16 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStep.java @@ -17,7 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.step; + +import org.sonar.server.computation.task.projectanalysis.step.ReportComputationSteps; /** * Implementations must be declared into {@link ReportComputationSteps#orderedStepClasses()} diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStepExecutor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStepExecutor.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStepExecutor.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStepExecutor.java index f5718e313c5..a13f43eec4f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStepExecutor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStepExecutor.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.step; import javax.annotation.CheckForNull; import javax.annotation.Nullable; @@ -33,7 +33,7 @@ public final class ComputationStepExecutor { private final Listener listener; /** - * Used when no {@link org.sonar.server.computation.step.ComputationStepExecutor.Listener} is available in pico + * Used when no {@link ComputationStepExecutor.Listener} is available in pico * container. */ public ComputationStepExecutor(ComputationSteps steps) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationSteps.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationSteps.java similarity index 86% rename from server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationSteps.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationSteps.java index 2e60e9841cb..2d24e5dcf82 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationSteps.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationSteps.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.step; import java.util.List; @@ -26,13 +26,13 @@ import java.util.List; */ public interface ComputationSteps { /** - * List of all {@link org.sonar.server.computation.step.ComputationStep}, + * List of all {@link ComputationStep}, * ordered by execution sequence. */ List> orderedStepClasses(); /** - * List of all {@link org.sonar.server.computation.step.ComputationStep}, + * List of all {@link ComputationStep}, * ordered by execution sequence. */ Iterable instances(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/analysis/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/package-info.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/analysis/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/task/step/package-info.java index 0a2dff9c242..9755de324d2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/analysis/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.computation.analysis; +package org.sonar.server.computation.task.step; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/report/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/report/package-info.java deleted file mode 100644 index e278c99a2aa..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/report/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.computation.taskprocessor.report; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepsTest.java deleted file mode 100644 index 31ff8881635..00000000000 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepsTest.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.server.computation.step; - -import com.google.common.base.Function; -import com.google.common.base.Predicate; -import com.google.common.collect.Lists; -import java.util.Set; -import org.junit.Test; -import org.picocontainer.ComponentAdapter; -import org.sonar.ce.queue.CeTask; -import org.sonar.ce.settings.ThreadLocalSettings; -import org.sonar.core.platform.ComponentContainer; -import org.sonar.core.platform.ContainerPopulator; -import org.sonar.server.computation.container.ComputeEngineContainerImpl; -import org.sonar.server.computation.container.ReportComputeEngineContainerPopulator; -import org.sonar.server.computation.container.StepsExplorer; - -import static com.google.common.collect.FluentIterable.from; -import static com.google.common.collect.Sets.difference; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; - -public class ComputationStepsTest { - - @Test - public void fail_if_a_step_is_not_registered_in_picocontainer() { - try { - Lists.newArrayList(new ReportComputationSteps(new ComputeEngineContainerImpl(new ComponentContainer(), mock(ContainerPopulator.class))).instances()); - fail(); - } catch (IllegalStateException e) { - assertThat(e).hasMessageContaining("Component not found"); - } - } - - @Test - public void all_steps_from_package_step_are_present_in_container() { - ComponentContainer parent = new ComponentContainer(); - parent.add(mock(ThreadLocalSettings.class)); - ComputeEngineContainerImpl ceContainer = new ComputeEngineContainerImpl(parent, new ReportComputeEngineContainerPopulator(mock(CeTask.class), null)); - - Set stepsCanonicalNames = StepsExplorer.retrieveStepPackageStepsCanonicalNames(); - - Set typesInContainer = from(ceContainer.getPicoContainer().getComponentAdapters()) - .transform(ComponentAdapterToImplementationClass.INSTANCE) - .filter(IsComputationStep.INSTANCE) - .transform(StepsExplorer.toCanonicalName()) - .toSet(); - - // PersistDevelopersStep is the only step that is not in the report container (it's only added when Dev Cockpit plugin is installed); - assertThat(difference(stepsCanonicalNames, typesInContainer)).containsOnly(PersistDevelopersStep.class.getCanonicalName()); - } - - private enum ComponentAdapterToImplementationClass implements Function, Class> { - INSTANCE; - - @Override - public Class apply(ComponentAdapter input) { - return input.getComponentImplementation(); - } - } - - private enum IsComputationStep implements Predicate> { - INSTANCE; - - @Override - public boolean apply(Class input) { - return ComputationStep.class.isAssignableFrom(input); - } - } -} diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/container/ComputeEngineContainerImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/container/TaskContainerImplTest.java similarity index 81% rename from server/sonar-server/src/test/java/org/sonar/server/computation/container/ComputeEngineContainerImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/container/TaskContainerImplTest.java index 7f81e4593be..997f02252eb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/container/ComputeEngineContainerImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/container/TaskContainerImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.container; +package org.sonar.server.computation.task.container; import org.junit.Test; import org.picocontainer.Startable; @@ -28,30 +28,30 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -public class ComputeEngineContainerImplTest { +public class TaskContainerImplTest { private ComponentContainer parent = new ComponentContainer(); private ContainerPopulator populator = mock(ContainerPopulator.class); @Test(expected = NullPointerException.class) public void constructor_fails_fast_on_null_container() { - new ComputeEngineContainerImpl(null, mock(ContainerPopulator.class)); + new TaskContainerImpl(null, mock(ContainerPopulator.class)); } @Test(expected = NullPointerException.class) public void constructor_fails_fast_on_null_item() { - new ComputeEngineContainerImpl(new ComponentContainer(), null); + new TaskContainerImpl(new ComponentContainer(), null); } @Test public void calls_method_populateContainer_of_passed_in_populator() { - ComputeEngineContainerImpl ceContainer = new ComputeEngineContainerImpl(parent, populator); + TaskContainerImpl ceContainer = new TaskContainerImpl(parent, populator); verify(populator).populateContainer(ceContainer); } @Test public void ce_container_is_not_child_of_specified_container() { - ComputeEngineContainerImpl ceContainer = new ComputeEngineContainerImpl(parent, populator); + TaskContainerImpl ceContainer = new TaskContainerImpl(parent, populator); assertThat(parent.getChildren()).isEmpty(); verify(populator).populateContainer(ceContainer); @@ -61,9 +61,9 @@ public class ComputeEngineContainerImplTest { public void components_are_started_lazily_unless_they_are_annotated_with_EagerStart() { final DefaultStartable defaultStartable = new DefaultStartable(); final EagerStartable eagerStartable = new EagerStartable(); - ComputeEngineContainerImpl ceContainer = new ComputeEngineContainerImpl(parent, new ContainerPopulator() { + TaskContainerImpl ceContainer = new TaskContainerImpl(parent, new ContainerPopulator() { @Override - public void populateContainer(ComputeEngineContainer container) { + public void populateContainer(TaskContainer container) { container.add(defaultStartable); container.add(eagerStartable); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/analysis/AnalysisImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisImplTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/analysis/AnalysisImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisImplTest.java index 933b39c876f..f1143c926e4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/analysis/AnalysisImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.analysis; +package org.sonar.server.computation.task.projectanalysis.analysis; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/analysis/AnalysisMetadataHolderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImplTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/computation/analysis/AnalysisMetadataHolderImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImplTest.java index a3d20faee3b..85eb76be394 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/analysis/AnalysisMetadataHolderImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.analysis; +package org.sonar.server.computation.task.projectanalysis.analysis; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/analysis/AnalysisMetadataHolderRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderRule.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/analysis/AnalysisMetadataHolderRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderRule.java index 9237846c43b..bab325019b3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/analysis/AnalysisMetadataHolderRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderRule.java @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.analysis; +package org.sonar.server.computation.task.projectanalysis.analysis; import java.util.Date; import java.util.Map; import javax.annotation.CheckForNull; import javax.annotation.Nullable; import org.junit.rules.ExternalResource; -import org.sonar.server.computation.qualityprofile.QualityProfile; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.QualityProfile; import org.sonar.server.computation.util.InitializedProperty; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/analysis/MutableAnalysisMetadataHolderRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolderRule.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/analysis/MutableAnalysisMetadataHolderRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolderRule.java index d28cc74c486..49f62b9425e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/analysis/MutableAnalysisMetadataHolderRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolderRule.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.analysis; +package org.sonar.server.computation.task.projectanalysis.analysis; import java.util.Map; import javax.annotation.CheckForNull; import javax.annotation.Nullable; import org.junit.rules.ExternalResource; -import org.sonar.server.computation.qualityprofile.QualityProfile; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.QualityProfile; public class MutableAnalysisMetadataHolderRule extends ExternalResource implements MutableAnalysisMetadataHolder { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/api/ComponentImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImplTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/api/ComponentImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImplTest.java index b89817737df..a4acb316230 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/api/ComponentImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure.api; +package org.sonar.server.computation.task.projectanalysis.api.measurecomputer; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/api/MeasureComputerContextImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java similarity index 89% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/api/MeasureComputerContextImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java index 73d1c58d208..9424cd660ba 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/api/MeasureComputerContextImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure.api; +package org.sonar.server.computation.task.projectanalysis.api.measurecomputer; import com.google.common.base.Optional; import java.util.Arrays; @@ -32,14 +32,14 @@ import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.Duration; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.SettingsRepository; -import org.sonar.server.computation.issue.ComponentIssuesRepositoryRule; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricImpl; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.SettingsRepository; +import org.sonar.server.computation.task.projectanalysis.issue.ComponentIssuesRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricImpl; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; @@ -47,8 +47,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.sonar.api.measures.CoreMetrics.COMMENT_LINES_KEY; import static org.sonar.api.measures.CoreMetrics.NCLOC_KEY; -import static org.sonar.server.computation.component.ReportComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; public class MeasureComputerContextImplTest { @@ -66,16 +66,16 @@ public class MeasureComputerContextImplTest { private static final String FILE_1_KEY = "fileKey"; private static final int FILE_2_REF = 12342; - private static final org.sonar.server.computation.component.Component FILE_1 = builder(org.sonar.server.computation.component.Component.Type.FILE, FILE_1_REF) + private static final org.sonar.server.computation.task.projectanalysis.component.Component FILE_1 = builder(org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE, FILE_1_REF) .setKey(FILE_1_KEY) .build(); @Rule public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule() - .setRoot(builder(org.sonar.server.computation.component.Component.Type.PROJECT, PROJECT_REF).setKey("project") + .setRoot(builder(org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT, PROJECT_REF).setKey("project") .addChildren( FILE_1, - builder(org.sonar.server.computation.component.Component.Type.FILE, FILE_2_REF).setKey("fileKey2").build() + builder(org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE, FILE_2_REF).setKey("fileKey2").build() ).build()); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/api/MeasureComputerDefinitionImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/api/MeasureComputerDefinitionImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java index 47277eb05c1..4754960a0d0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/api/MeasureComputerDefinitionImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure.api; +package org.sonar.server.computation.task.projectanalysis.api.measurecomputer; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/api/MeasureImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImplTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/api/MeasureImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImplTest.java index c78082b3164..ace01311f26 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/api/MeasureImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImplTest.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure.api; +package org.sonar.server.computation.task.projectanalysis.api.measurecomputer; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.server.computation.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/posttask/CeTaskImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImplTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/posttask/CeTaskImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImplTest.java index 785441dc7ca..37828873932 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/posttask/CeTaskImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.posttask; +package org.sonar.server.computation.task.projectanalysis.api.posttask; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/posttask/ConditionImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImplTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/posttask/ConditionImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImplTest.java index 577fa19053a..d052c1b66e1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/posttask/ConditionImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.posttask; +package org.sonar.server.computation.task.projectanalysis.api.posttask; import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/posttask/ConditionToConditionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToConditionTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/posttask/ConditionToConditionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToConditionTest.java index 0cc156504cb..3532024fab7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/posttask/ConditionToConditionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToConditionTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.posttask; +package org.sonar.server.computation.task.projectanalysis.api.posttask; import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; @@ -29,9 +29,9 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.sonar.api.ce.posttask.QualityGate; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.qualitygate.Condition; -import org.sonar.server.computation.qualitygate.ConditionStatus; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.qualitygate.Condition; +import org.sonar.server.computation.task.projectanalysis.qualitygate.ConditionStatus; import static com.google.common.collect.ImmutableMap.of; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/posttask/PostProjectAnalysisTasksExecutorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java similarity index 91% rename from server/sonar-server/src/test/java/org/sonar/server/computation/posttask/PostProjectAnalysisTasksExecutorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java index 60642737e6a..5d4506e68f1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/posttask/PostProjectAnalysisTasksExecutorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.posttask; +package org.sonar.server.computation.task.projectanalysis.api.posttask; import com.google.common.collect.ImmutableMap; import com.tngtech.java.junit.dataprovider.DataProvider; @@ -34,14 +34,14 @@ import org.mockito.InOrder; import org.sonar.api.ce.posttask.PostProjectAnalysisTask; import org.sonar.api.ce.posttask.Project; import org.sonar.ce.queue.CeTask; -import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.qualitygate.Condition; -import org.sonar.server.computation.qualitygate.ConditionStatus; -import org.sonar.server.computation.qualitygate.MutableQualityGateHolderRule; -import org.sonar.server.computation.qualitygate.MutableQualityGateStatusHolderRule; -import org.sonar.server.computation.qualitygate.QualityGate; -import org.sonar.server.computation.qualitygate.QualityGateStatus; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.qualitygate.Condition; +import org.sonar.server.computation.task.projectanalysis.qualitygate.ConditionStatus; +import org.sonar.server.computation.task.projectanalysis.qualitygate.MutableQualityGateHolderRule; +import org.sonar.server.computation.task.projectanalysis.qualitygate.MutableQualityGateStatusHolderRule; +import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGate; +import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateStatus; import static com.google.common.collect.ImmutableList.of; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/posttask/ProjectImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImplTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/posttask/ProjectImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImplTest.java index 716627ac89e..f2dca14cd4b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/posttask/ProjectImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.posttask; +package org.sonar.server.computation.task.projectanalysis.api.posttask; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/posttask/QualityGateImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImplTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/posttask/QualityGateImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImplTest.java index e8c8bda7e62..9d1b3866dc6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/posttask/QualityGateImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.posttask; +package org.sonar.server.computation.task.projectanalysis.api.posttask; import com.google.common.collect.ImmutableList; import java.util.Collections; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/batch/BatchReportDirectoryHolderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImplTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/batch/BatchReportDirectoryHolderImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImplTest.java index 4ba8a09327e..30eee8fbd47 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/batch/BatchReportDirectoryHolderImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.batch; +package org.sonar.server.computation.task.projectanalysis.batch; import java.io.File; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/batch/BatchReportReaderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImplTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/computation/batch/BatchReportReaderImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImplTest.java index 6a8331f348d..e7f9f432d79 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/batch/BatchReportReaderImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.batch; +package org.sonar.server.computation.task.projectanalysis.batch; import java.io.File; import java.io.IOException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/batch/BatchReportReaderRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderRule.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/computation/batch/BatchReportReaderRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderRule.java index 0c21f1bd677..51781aaa676 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/batch/BatchReportReaderRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderRule.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.batch; +package org.sonar.server.computation.task.projectanalysis.batch; import com.google.common.base.Optional; import com.google.common.base.Preconditions; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/batch/ImmutableBatchReportDirectoryHolder.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/ImmutableBatchReportDirectoryHolder.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/batch/ImmutableBatchReportDirectoryHolder.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/ImmutableBatchReportDirectoryHolder.java index b32b8c48a2d..539b755d198 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/batch/ImmutableBatchReportDirectoryHolder.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/ImmutableBatchReportDirectoryHolder.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.batch; +package org.sonar.server.computation.task.projectanalysis.batch; import java.io.File; import java.util.Objects; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/AbstractComponentProvider.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/AbstractComponentProvider.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/AbstractComponentProvider.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/AbstractComponentProvider.java index f4903830c6b..ccbc3ccb5e0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/AbstractComponentProvider.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/AbstractComponentProvider.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import static com.google.common.base.Preconditions.checkState; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/CallRecord.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecord.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/CallRecord.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecord.java index fd2213fc64c..ca5c73c9d43 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/CallRecord.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecord.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.Objects; import javax.annotation.CheckForNull; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/CallRecorderPathAwareVisitor.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderPathAwareVisitor.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/CallRecorderPathAwareVisitor.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderPathAwareVisitor.java index 89df10627d5..28260988c3f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/CallRecorderPathAwareVisitor.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderPathAwareVisitor.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import com.google.common.base.Function; import java.util.ArrayList; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/CallRecorderTypeAwareVisitor.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderTypeAwareVisitor.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/CallRecorderTypeAwareVisitor.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderTypeAwareVisitor.java index 4a615226c13..23d6805a9f7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/CallRecorderTypeAwareVisitor.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderTypeAwareVisitor.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.ArrayList; import java.util.List; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentFunctionsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctionsTest.java similarity index 75% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentFunctionsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctionsTest.java index a78e551489c..5e280d213ef 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentFunctionsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctionsTest.java @@ -17,18 +17,18 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.Random; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ComponentFunctions.toKey; -import static org.sonar.server.computation.component.ComponentFunctions.toReportRef; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentFunctions.toKey; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentFunctions.toReportRef; public class ComponentFunctionsTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImplTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImplTest.java index 1a50e60e6c0..90ffa33a9e3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import org.junit.Rule; import org.junit.Test; @@ -35,7 +35,7 @@ import static org.sonar.scanner.protocol.output.ScannerReport.Component.Componen import static org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType.FILE; import static org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType.UNRECOGNIZED; import static org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType.UNSET; -import static org.sonar.server.computation.component.ComponentImpl.builder; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentImpl.builder; public class ComponentImplTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentProvider.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentProvider.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentProvider.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentProvider.java index 489ae292406..1c174546e6d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentProvider.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentProvider.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; public interface ComponentProvider { /** diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTest.java similarity index 82% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTest.java index b65a4edb18a..beecd8008cd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTest.java @@ -17,19 +17,19 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import com.google.common.collect.ImmutableList; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; public class ComponentTest { @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/CrawlerDepthLimitTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimitTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/CrawlerDepthLimitTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimitTest.java index 7d89356809e..f26c4907f07 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/CrawlerDepthLimitTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimitTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -32,7 +32,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; -import org.sonar.server.computation.component.Component.Type; +import org.sonar.server.computation.task.projectanalysis.component.Component.Type; import static com.google.common.base.Predicates.equalTo; import static com.google.common.base.Predicates.in; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/DbIdsRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImplTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/DbIdsRepositoryImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImplTest.java index 81af6707995..fe071c02764 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/DbIdsRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImplTest.java @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; public class DbIdsRepositoryImplTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/DisabledComponentsHolderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImplTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/DisabledComponentsHolderImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImplTest.java index 055699a420e..91c94704164 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/DisabledComponentsHolderImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/DumbDeveloper.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DumbDeveloper.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/DumbDeveloper.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DumbDeveloper.java index 2551761461e..1baafc3329c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/DumbDeveloper.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DumbDeveloper.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; /** * Implementation od {@link Developer} only used for test diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/MutableDbIdsRepositoryRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepositoryRule.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/MutableDbIdsRepositoryRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepositoryRule.java index 3ae1c60329f..ca17bd2aad0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/MutableDbIdsRepositoryRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepositoryRule.java @@ -17,12 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import com.google.common.base.Function; import javax.annotation.Nullable; import org.junit.rules.ExternalResource; -import org.sonar.server.computation.batch.TreeRootHolderRule; /** * Implementation of {@link DbIdsRepository} as a JUnit {@link org.junit.Rule} which supports both diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/MutableTreeRootHolderRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolderRule.java similarity index 90% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/MutableTreeRootHolderRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolderRule.java index c4737613d58..b9144148d3f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/MutableTreeRootHolderRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolderRule.java @@ -17,9 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; - -import org.sonar.server.computation.batch.TreeRootHolderRule; +package org.sonar.server.computation.task.projectanalysis.component; public class MutableTreeRootHolderRule extends TreeRootHolderRule implements MutableTreeRootHolder { @Override diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/NoComponentProvider.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/NoComponentProvider.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/NoComponentProvider.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/NoComponentProvider.java index 06fee1f8008..3b09bd826ab 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/NoComponentProvider.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/NoComponentProvider.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; public enum NoComponentProvider implements ComponentProvider { INSTANCE; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/PathAwareCallRecord.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCallRecord.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/PathAwareCallRecord.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCallRecord.java index f4239b95dcc..bfcec4f8e47 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/PathAwareCallRecord.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCallRecord.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.List; import java.util.Objects; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportComponent.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportComponent.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportComponent.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportComponent.java index e4db512717a..cbf9e99fd90 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportComponent.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportComponent.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import com.google.common.collect.ImmutableList; import java.util.ArrayList; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportPathAwareVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPathAwareVisitorTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportPathAwareVisitorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPathAwareVisitorTest.java index 461ad47d90e..5461ac33dc4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportPathAwareVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPathAwareVisitorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.Iterator; import java.util.List; @@ -26,12 +26,12 @@ import org.junit.Test; import static com.google.common.collect.ImmutableList.of; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ReportPathAwareVisitorTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java index 7f8270433bf..5edbb43b3b5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java @@ -17,16 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; public class ReportPostOrderDepthTraversalTypeAwareCrawlerTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java index c9d0ad2113c..8af108e31ec 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java @@ -17,16 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ReportPreOrderDepthTraversalTypeAwareCrawlerTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportVisitorsCrawlerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerTest.java similarity index 90% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportVisitorsCrawlerTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerTest.java index 5edcf20ad8b..f5e4f5519c6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportVisitorsCrawlerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.Arrays; import org.junit.Rule; @@ -29,12 +29,12 @@ import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.spy; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ReportVisitorsCrawlerTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportVisitorsCrawlerWithPathAwareVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPathAwareVisitorTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportVisitorsCrawlerWithPathAwareVisitorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPathAwareVisitorTest.java index 92741b9833e..63f373b3c6b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportVisitorsCrawlerWithPathAwareVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPathAwareVisitorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.Arrays; import java.util.Iterator; @@ -27,12 +27,12 @@ import org.junit.Test; import static com.google.common.collect.ImmutableList.of; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ReportVisitorsCrawlerWithPathAwareVisitorTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java index 98b2a15bb5d..a86ad6eeb76 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.Arrays; import org.junit.Test; @@ -26,11 +26,11 @@ import org.mockito.InOrder; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; public class ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java index 77a2fd9edc6..5f46cce16b9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.Arrays; import org.junit.Test; @@ -26,11 +26,11 @@ import org.mockito.InOrder; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/SettingsRepositoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/SettingsRepositoryTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/SettingsRepositoryTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/SettingsRepositoryTest.java index 74a4130788e..173cebac3dc 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/SettingsRepositoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/SettingsRepositoryTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import org.junit.After; import org.junit.Before; @@ -35,7 +35,7 @@ import org.sonar.db.property.PropertyDto; import org.sonar.server.properties.ProjectSettingsFactory; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; public class SettingsRepositoryTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/TreeComponentProvider.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeComponentProvider.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/TreeComponentProvider.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeComponentProvider.java index 8e216d9bf86..93176dca9b0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/TreeComponentProvider.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeComponentProvider.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.HashMap; import java.util.Map; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/TreeRootHolderComponentProvider.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderComponentProvider.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/TreeRootHolderComponentProvider.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderComponentProvider.java index ed3b4935ba2..01e41fff07e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/TreeRootHolderComponentProvider.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderComponentProvider.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; public final class TreeRootHolderComponentProvider extends AbstractComponentProvider { private final TreeRootHolder treeRootHolder; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/TreeRootHolderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImplTest.java similarity index 88% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/TreeRootHolderImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImplTest.java index 14180b768eb..a56b5200788 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/TreeRootHolderImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImplTest.java @@ -17,20 +17,20 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ReportComponent.DUMB_PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; public class TreeRootHolderImplTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/batch/TreeRootHolderRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderRule.java similarity index 87% rename from server/sonar-server/src/test/java/org/sonar/server/computation/batch/TreeRootHolderRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderRule.java index 6a73667eb71..9925737698e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/batch/TreeRootHolderRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderRule.java @@ -17,12 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.batch; +package org.sonar.server.computation.task.projectanalysis.component; import org.junit.rules.ExternalResource; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TreeRootHolderImpl; public class TreeRootHolderRule extends ExternalResource implements TreeRootHolder { protected TreeRootHolderImpl delegate = new TreeRootHolderImpl(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/TypeAwareVisitorAdapterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapterTest.java similarity index 85% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/TypeAwareVisitorAdapterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapterTest.java index d0824dcb756..0a4e1d7cc5d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/TypeAwareVisitorAdapterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapterTest.java @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import org.junit.Test; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; public class TypeAwareVisitorAdapterTest { @Test(expected = NullPointerException.class) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsComponent.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsComponent.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsComponent.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsComponent.java index 1cc0eace336..696ed816e87 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsComponent.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsComponent.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import com.google.common.collect.ImmutableList; import java.util.ArrayList; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsPathAwareVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPathAwareVisitorTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsPathAwareVisitorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPathAwareVisitorTest.java index 1f10dd85803..e867d549954 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsPathAwareVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPathAwareVisitorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.Iterator; import java.util.List; @@ -26,11 +26,11 @@ import org.junit.Test; import static com.google.common.collect.ImmutableList.of; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ViewsPathAwareVisitorTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsPostOrderDepthTraversalTypeAwareCrawlerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPostOrderDepthTraversalTypeAwareCrawlerTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsPostOrderDepthTraversalTypeAwareCrawlerTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPostOrderDepthTraversalTypeAwareCrawlerTest.java index 51f49374462..57a0365f0f5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsPostOrderDepthTraversalTypeAwareCrawlerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPostOrderDepthTraversalTypeAwareCrawlerTest.java @@ -17,15 +17,15 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; public class ViewsPostOrderDepthTraversalTypeAwareCrawlerTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsPreOrderDepthTraversalTypeAwareCrawlerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPreOrderDepthTraversalTypeAwareCrawlerTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsPreOrderDepthTraversalTypeAwareCrawlerTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPreOrderDepthTraversalTypeAwareCrawlerTest.java index 27e5c5adb0d..5eef7d931b9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsPreOrderDepthTraversalTypeAwareCrawlerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPreOrderDepthTraversalTypeAwareCrawlerTest.java @@ -17,15 +17,15 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ViewsPreOrderDepthTraversalTypeAwareCrawlerTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsVisitorsCrawlerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java similarity index 91% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsVisitorsCrawlerTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java index 2cb60bb2fb8..0e20adaac1b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsVisitorsCrawlerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.Arrays; import org.junit.Rule; @@ -29,11 +29,11 @@ import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.spy; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ViewsVisitorsCrawlerTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsVisitorsCrawlerWithPathAwareVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPathAwareVisitorTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsVisitorsCrawlerWithPathAwareVisitorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPathAwareVisitorTest.java index 3fd3173f582..2eb578c8814 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsVisitorsCrawlerWithPathAwareVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPathAwareVisitorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.Arrays; import java.util.Iterator; @@ -27,11 +27,11 @@ import org.junit.Test; import static com.google.common.collect.ImmutableList.of; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ViewsVisitorsCrawlerWithPathAwareVisitorTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java index 1d6a45fa546..2b02dbe3347 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.Arrays; import org.junit.Test; @@ -26,10 +26,10 @@ import org.mockito.InOrder; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; public class ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java index e5ed4f04978..24db0a02fdb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.component; +package org.sonar.server.computation.task.projectanalysis.component; import java.util.Arrays; import org.junit.Test; @@ -26,10 +26,10 @@ import org.mockito.InOrder; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java similarity index 77% rename from server/sonar-server/src/test/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulatorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java index 662cf5b336e..80d9e691850 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.container; +package org.sonar.server.computation.task.projectanalysis.container; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -34,9 +34,11 @@ import org.picocontainer.PicoContainer; import org.sonar.ce.queue.CeTask; import org.sonar.core.platform.ComponentContainer; import org.sonar.plugin.ce.ReportAnalysisComponentProvider; -import org.sonar.server.computation.step.ComputationStep; -import org.sonar.server.computation.step.PersistComponentsStep; -import org.sonar.server.computation.step.PersistDevelopersStep; +import org.sonar.server.computation.task.container.TaskContainer; +import org.sonar.server.computation.task.step.StepsExplorer; +import org.sonar.server.computation.task.projectanalysis.step.PersistComponentsStep; +import org.sonar.server.computation.task.projectanalysis.step.PersistDevelopersStep; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.base.Predicates.notNull; import static com.google.common.collect.FluentIterable.from; @@ -45,14 +47,16 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class ReportComputeEngineContainerPopulatorTest { +public class ProjectAnalysisTaskContainerPopulatorTest { + private static final String PROJECTANALYSIS_STEP_PACKAGE = "org.sonar.server.computation.task.projectanalysis.step"; + private CeTask task = mock(CeTask.class); - private ReportComputeEngineContainerPopulator underTest; + private ProjectAnalysisTaskContainerPopulator underTest; @Test public void item_is_added_to_the_container() { - underTest = new ReportComputeEngineContainerPopulator(task, null); - AddedObjectsRecorderComputeEngineContainer container = new AddedObjectsRecorderComputeEngineContainer(); + underTest = new ProjectAnalysisTaskContainerPopulator(task, null); + AddedObjectsRecorderTaskContainer container = new AddedObjectsRecorderTaskContainer(); underTest.populateContainer(container); assertThat(container.added).contains(task); @@ -60,8 +64,8 @@ public class ReportComputeEngineContainerPopulatorTest { @Test public void all_computation_steps_are_added_in_order_to_the_container() { - underTest = new ReportComputeEngineContainerPopulator(task, null); - AddedObjectsRecorderComputeEngineContainer container = new AddedObjectsRecorderComputeEngineContainer(); + underTest = new ProjectAnalysisTaskContainerPopulator(task, null); + AddedObjectsRecorderTaskContainer container = new AddedObjectsRecorderTaskContainer(); underTest.populateContainer(container); Set computationStepClassNames = from(container.added) @@ -81,13 +85,13 @@ public class ReportComputeEngineContainerPopulatorTest { .toSet(); // PersistDevelopersStep is the only step that is not in the report container (it's only added when Dev Cockpit plugin is installed) - assertThat(difference(StepsExplorer.retrieveStepPackageStepsCanonicalNames(), computationStepClassNames)).containsOnly(PersistDevelopersStep.class.getCanonicalName()); + assertThat(difference(StepsExplorer.retrieveStepPackageStepsCanonicalNames(PROJECTANALYSIS_STEP_PACKAGE), computationStepClassNames)).containsOnly(PersistDevelopersStep.class.getCanonicalName()); } @Test public void at_least_one_core_step_is_added_to_the_container() { - underTest = new ReportComputeEngineContainerPopulator(task, null); - AddedObjectsRecorderComputeEngineContainer container = new AddedObjectsRecorderComputeEngineContainer(); + underTest = new ProjectAnalysisTaskContainerPopulator(task, null); + AddedObjectsRecorderTaskContainer container = new AddedObjectsRecorderTaskContainer(); underTest.populateContainer(container); assertThat(container.added).contains(PersistComponentsStep.class); @@ -95,8 +99,8 @@ public class ReportComputeEngineContainerPopulatorTest { @Test public void PersistDevelopersStep_is_not_added_to_the_container_when_DevCockpitBridge_is_null() { - underTest = new ReportComputeEngineContainerPopulator(task, null); - AddedObjectsRecorderComputeEngineContainer container = new AddedObjectsRecorderComputeEngineContainer(); + underTest = new ProjectAnalysisTaskContainerPopulator(task, null); + AddedObjectsRecorderTaskContainer container = new AddedObjectsRecorderTaskContainer(); underTest.populateContainer(container); assertThat(container.added).doesNotContain(PersistDevelopersStep.class); @@ -109,8 +113,8 @@ public class ReportComputeEngineContainerPopulatorTest { ReportAnalysisComponentProvider componentProvider = mock(ReportAnalysisComponentProvider.class); when(componentProvider.getComponents()).thenReturn(ImmutableList.of(object, clazz)); - underTest = new ReportComputeEngineContainerPopulator(task, new ReportAnalysisComponentProvider[] {componentProvider}); - AddedObjectsRecorderComputeEngineContainer container = new AddedObjectsRecorderComputeEngineContainer(); + underTest = new ProjectAnalysisTaskContainerPopulator(task, new ReportAnalysisComponentProvider[] {componentProvider}); + AddedObjectsRecorderTaskContainer container = new AddedObjectsRecorderTaskContainer(); container.add(componentProvider); underTest.populateContainer(container); @@ -130,7 +134,7 @@ public class ReportComputeEngineContainerPopulatorTest { } } - private static class AddedObjectsRecorderComputeEngineContainer implements ComputeEngineContainer { + private static class AddedObjectsRecorderTaskContainer implements TaskContainer { private static final DefaultPicoContainer SOME_EMPTY_PICO_CONTAINER = new DefaultPicoContainer(); private List added = new ArrayList<>(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/CrossProjectDuplicateTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicateTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/duplication/CrossProjectDuplicateTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicateTest.java index a4792ea0ac9..3e49915f8a4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/CrossProjectDuplicateTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicateTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/CrossProjectDuplicationStatusHolderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/duplication/CrossProjectDuplicationStatusHolderImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java index ec27d22f896..d297dcdd1f6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/CrossProjectDuplicationStatusHolderImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; -import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/DuplicateTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicateTest.java similarity index 87% rename from server/sonar-server/src/test/java/org/sonar/server/computation/duplication/DuplicateTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicateTest.java index e199a52c82c..9b065a9febf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/DuplicateTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicateTest.java @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import org.junit.Test; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/DuplicationRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImplTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/duplication/DuplicationRepositoryImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImplTest.java index c19daa74bea..457d877ab0f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/DuplicationRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; @@ -27,8 +27,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; import org.sonar.server.util.WrapInSingleElementArray; import static com.google.common.base.Predicates.equalTo; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/DuplicationRepositoryRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryRule.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/duplication/DuplicationRepositoryRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryRule.java index 7536a4fb73a..6da1ccbe442 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/DuplicationRepositoryRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryRule.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import com.google.common.base.Function; import com.google.common.collect.ArrayListMultimap; @@ -26,11 +26,11 @@ import java.util.Arrays; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import org.junit.rules.ExternalResource; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ComponentProvider; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TreeRootHolderComponentProvider; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ComponentProvider; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderComponentProvider; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.FluentIterable.from; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/DuplicationTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/duplication/DuplicationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationTest.java index 702a6dfa667..211d06840b4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/DuplicationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import com.google.common.collect.ImmutableSet; import java.util.ArrayList; @@ -28,8 +28,8 @@ import java.util.List; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/InProjectDuplicateTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicateTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/duplication/InProjectDuplicateTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicateTest.java index 350ea17722e..32e83be68b6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/InProjectDuplicateTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicateTest.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/InnerDuplicateTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicateTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/duplication/InnerDuplicateTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicateTest.java index c7d8b647ada..4d5e04ff078 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/InnerDuplicateTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicateTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/IntegrateCrossProjectDuplicationsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplicationsTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/duplication/IntegrateCrossProjectDuplicationsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplicationsTest.java index d27eb394d94..d39ce43e130 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/IntegrateCrossProjectDuplicationsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplicationsTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import java.util.ArrayList; import java.util.Arrays; @@ -30,16 +30,16 @@ import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; import org.sonar.duplications.block.Block; import org.sonar.duplications.block.ByteArray; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.FileAttributes; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; import static com.google.common.base.Strings.padStart; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; public class IntegrateCrossProjectDuplicationsTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/TextBlockTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlockTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/duplication/TextBlockTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlockTest.java index 89ed6330cf6..c822a5f906d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/duplication/TextBlockTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlockTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.duplication; +package org.sonar.server.computation.task.projectanalysis.duplication; import java.util.ArrayList; import java.util.Arrays; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/event/EventRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImplTest.java similarity index 91% rename from server/sonar-server/src/test/java/org/sonar/server/computation/event/EventRepositoryImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImplTest.java index 2872cef0bfc..8cb3f5eae7e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/event/EventRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImplTest.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.event; +package org.sonar.server.computation.task.projectanalysis.event; import java.util.Arrays; import org.junit.Test; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.ViewsComponent; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/event/EventTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/event/EventTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventTest.java index ef332242f78..93b6ecfcd79 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/event/EventTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.event; +package org.sonar.server.computation.task.projectanalysis.event; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/filemove/FileMoveDetectionStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/filemove/FileMoveDetectionStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java index b68de72e6ba..3075c6c366a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/filemove/FileMoveDetectionStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.filemove; +package org.sonar.server.computation.task.projectanalysis.filemove; import java.io.File; import java.io.IOException; @@ -43,12 +43,12 @@ import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentTreeQuery; import org.sonar.db.source.FileSourceDao; import org.sonar.db.source.FileSourceDto; -import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.analysis.Analysis; -import org.sonar.server.computation.source.SourceLinesRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.analysis.Analysis; +import org.sonar.server.computation.task.projectanalysis.source.SourceLinesRepositoryRule; import static com.google.common.base.Joiner.on; import static java.util.Arrays.stream; @@ -60,7 +60,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.sonar.api.resources.Qualifiers.FILE; import static org.sonar.api.resources.Qualifiers.UNIT_TEST_FILE; -import static org.sonar.server.computation.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; public class FileMoveDetectionStepTest { @@ -79,7 +79,7 @@ public class FileMoveDetectionStepTest { private static final Component FILE_2 = fileComponent(FILE_2_REF); private static final Component FILE_3 = fileComponent(FILE_3_REF); private static final String[] CONTENT1 = { - "package org.sonar.server.computation.filemove;", + "package org.sonar.server.computation.task.projectanalysis.filemove;", "", "public class Foo {", " public String bar() {", @@ -89,7 +89,7 @@ public class FileMoveDetectionStepTest { }; private static final String[] LESS_CONTENT1 = { - "package org.sonar.server.computation.filemove;", + "package org.sonar.server.computation.task.projectanalysis.filemove;", "", "public class Foo {", "}" @@ -439,7 +439,7 @@ public class FileMoveDetectionStepTest { public void real_life_use_case() throws Exception { analysisMetadataHolder.setBaseProjectSnapshot(ANALYSIS); List componentDtoKey = new ArrayList<>(); - for (File f : FileUtils.listFiles(new File("src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1"), null, false)) { + for (File f : FileUtils.listFiles(new File("src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1"), null, false)) { componentDtoKey.add(f.getName()); mockContentOfFileInDb(f.getName(), readLines(f)); } @@ -447,7 +447,7 @@ public class FileMoveDetectionStepTest { Map comps = new HashMap<>(); int i = 1; - for (File f : FileUtils.listFiles(new File("src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v2"), null, false)) { + for (File f : FileUtils.listFiles(new File("src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2"), null, false)) { comps.put(f.getName(), builder(Component.Type.FILE, i) .setKey(f.getName()) .setPath(f.getName()) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/filemove/MatchesByScoreTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScoreTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/filemove/MatchesByScoreTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScoreTest.java index 06ade5734f0..0e706fc9e67 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/filemove/MatchesByScoreTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScoreTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.filemove; +package org.sonar.server.computation.task.projectanalysis.filemove; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -31,7 +31,7 @@ import org.junit.Test; import static com.google.common.collect.ImmutableSet.of; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.filemove.FileMoveDetectionStep.MIN_REQUIRED_SCORE; +import static org.sonar.server.computation.task.projectanalysis.filemove.FileMoveDetectionStep.MIN_REQUIRED_SCORE; public class MatchesByScoreTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/filemove/MutableMovedFilesRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImplTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/filemove/MutableMovedFilesRepositoryImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImplTest.java index 15bbc7b75a6..be566d8bc39 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/filemove/MutableMovedFilesRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImplTest.java @@ -17,19 +17,19 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.filemove; +package org.sonar.server.computation.task.projectanalysis.filemove; import java.util.Random; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ViewsComponent; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.assertj.guava.api.Assertions.assertThat; -import static org.sonar.server.computation.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; public class MutableMovedFilesRepositoryImplTest { private static final Component SOME_FILE = builder(Component.Type.FILE, 1).build(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/filemove/MutableMovedFilesRepositoryRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryRule.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/filemove/MutableMovedFilesRepositoryRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryRule.java index 3bcb077f800..b6a8276a6b5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/filemove/MutableMovedFilesRepositoryRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryRule.java @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.filemove; +package org.sonar.server.computation.task.projectanalysis.filemove; import com.google.common.base.Optional; import java.util.HashSet; import java.util.Set; import javax.annotation.CheckForNull; import org.junit.rules.ExternalResource; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; public class MutableMovedFilesRepositoryRule extends ExternalResource implements MutableMovedFilesRepository { @CheckForNull diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/filemove/SourceSimilarityImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImplTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/filemove/SourceSimilarityImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImplTest.java index 8789b875b47..1c17dc35288 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/filemove/SourceSimilarityImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.filemove; +package org.sonar.server.computation.task.projectanalysis.filemove; import java.util.List; import org.junit.Rule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/AverageFormulaExecutionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaExecutionTest.java similarity index 80% rename from server/sonar-server/src/test/java/org/sonar/server/computation/formula/AverageFormulaExecutionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaExecutionTest.java index d220c476812..b47aea3b827 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/AverageFormulaExecutionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaExecutionTest.java @@ -17,33 +17,33 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula; +package org.sonar.server.computation.task.projectanalysis.formula; import com.google.common.collect.Lists; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.PathAwareCrawler; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.period.PeriodsHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolderRule; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; import static org.sonar.api.measures.CoreMetrics.COMPLEXITY_IN_FUNCTIONS_KEY; import static org.sonar.api.measures.CoreMetrics.FUNCTIONS_KEY; import static org.sonar.api.measures.CoreMetrics.FUNCTION_COMPLEXITY_KEY; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ReportComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class AverageFormulaExecutionTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/AverageFormulaTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/formula/AverageFormulaTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaTest.java index 404affd31ce..c5a382ae22b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/AverageFormulaTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaTest.java @@ -17,18 +17,18 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula; +package org.sonar.server.computation.task.projectanalysis.formula; import com.google.common.base.Optional; import org.assertj.guava.api.Assertions; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.anyString; @@ -37,7 +37,7 @@ import static org.mockito.Mockito.when; import static org.sonar.api.measures.CoreMetrics.COMPLEXITY_IN_FUNCTIONS_KEY; import static org.sonar.api.measures.CoreMetrics.FUNCTIONS_KEY; import static org.sonar.api.measures.CoreMetrics.FUNCTION_COMPLEXITY_KEY; -import static org.sonar.server.computation.formula.AverageFormula.Builder; +import static org.sonar.server.computation.task.projectanalysis.formula.AverageFormula.Builder; public class AverageFormulaTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/DistributionFormulaExecutionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaExecutionTest.java similarity index 79% rename from server/sonar-server/src/test/java/org/sonar/server/computation/formula/DistributionFormulaExecutionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaExecutionTest.java index cd6d2988e78..08f64f5d2ce 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/DistributionFormulaExecutionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaExecutionTest.java @@ -17,30 +17,30 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula; +package org.sonar.server.computation.task.projectanalysis.formula; import com.google.common.collect.Lists; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.PathAwareCrawler; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; import static org.sonar.api.measures.CoreMetrics.FUNCTION_COMPLEXITY_DISTRIBUTION_KEY; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ReportComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class DistributionFormulaExecutionTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/DistributionFormulaTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaTest.java similarity index 91% rename from server/sonar-server/src/test/java/org/sonar/server/computation/formula/DistributionFormulaTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaTest.java index 3c33220ca85..2a61210df6d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/DistributionFormulaTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaTest.java @@ -17,18 +17,18 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula; +package org.sonar.server.computation.task.projectanalysis.formula; import com.google.common.base.Optional; import org.assertj.guava.api.Assertions; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/DumbCreateMeasureContext.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DumbCreateMeasureContext.java similarity index 80% rename from server/sonar-server/src/test/java/org/sonar/server/computation/formula/DumbCreateMeasureContext.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DumbCreateMeasureContext.java index 79e4b086f28..2344e3da9b1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/DumbCreateMeasureContext.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DumbCreateMeasureContext.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula; +package org.sonar.server.computation.task.projectanalysis.formula; import java.util.List; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; public class DumbCreateMeasureContext implements CreateMeasureContext { private final Component component; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/IntSumFormulaTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/IntSumFormulaTest.java similarity index 90% rename from server/sonar-server/src/test/java/org/sonar/server/computation/formula/IntSumFormulaTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/IntSumFormulaTest.java index 7625eaddc78..bdcd03ded20 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/IntSumFormulaTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/IntSumFormulaTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula; +package org.sonar.server.computation.task.projectanalysis.formula; import com.google.common.base.Optional; import javax.annotation.Nullable; @@ -25,19 +25,19 @@ import org.assertj.guava.api.Assertions; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.formula.SumFormula.IntSumFormula; -import org.sonar.server.computation.formula.counter.IntSumCounter; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.formula.SumFormula.IntSumFormula; +import org.sonar.server.computation.task.projectanalysis.formula.counter.IntSumCounter; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.sonar.api.measures.CoreMetrics.LINES_KEY; -import static org.sonar.server.computation.formula.SumFormula.createIntSumFormula; +import static org.sonar.server.computation.task.projectanalysis.formula.SumFormula.createIntSumFormula; public class IntSumFormulaTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/LongSumFormulaTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/LongSumFormulaTest.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/formula/LongSumFormulaTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/LongSumFormulaTest.java index 133fb5d065d..c5848d79c49 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/LongSumFormulaTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/LongSumFormulaTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula; +package org.sonar.server.computation.task.projectanalysis.formula; import com.google.common.base.Optional; import javax.annotation.Nullable; @@ -25,18 +25,18 @@ import org.assertj.guava.api.Assertions; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.formula.counter.LongSumCounter; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.formula.counter.LongSumCounter; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.sonar.api.measures.CoreMetrics.LINES_KEY; -import static org.sonar.server.computation.formula.SumFormula.createLongSumFormula; +import static org.sonar.server.computation.task.projectanalysis.formula.SumFormula.createLongSumFormula; public class LongSumFormulaTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/ReportFormulaExecutorComponentVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java similarity index 89% rename from server/sonar-server/src/test/java/org/sonar/server/computation/formula/ReportFormulaExecutorComponentVisitorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java index 86ff7bf2eeb..1b8a02d8abf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/ReportFormulaExecutorComponentVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java @@ -17,38 +17,38 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula; +package org.sonar.server.computation.task.projectanalysis.formula; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import org.junit.Rule; import org.junit.Test; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.PathAwareCrawler; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.formula.counter.IntVariationValue; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.formula.counter.IntVariationValue; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolderRule; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.api.measures.CoreMetrics.LINES_KEY; import static org.sonar.api.measures.CoreMetrics.NCLOC_KEY; import static org.sonar.api.measures.CoreMetrics.NEW_IT_COVERAGE_KEY; import static org.sonar.api.measures.CoreMetrics.NEW_LINES_TO_COVER_KEY; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ReportComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ReportFormulaExecutorComponentVisitorTest { private static final int ROOT_REF = 1; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/SumFormulaExecutionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormulaExecutionTest.java similarity index 76% rename from server/sonar-server/src/test/java/org/sonar/server/computation/formula/SumFormulaExecutionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormulaExecutionTest.java index 044f7ecf85b..b198f6adb92 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/SumFormulaExecutionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormulaExecutionTest.java @@ -17,31 +17,31 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula; +package org.sonar.server.computation.task.projectanalysis.formula; import com.google.common.collect.Lists; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.PathAwareCrawler; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; import static org.sonar.api.measures.CoreMetrics.LINES_KEY; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ReportComponent.builder; -import static org.sonar.server.computation.formula.SumFormula.createIntSumFormula; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.formula.SumFormula.createIntSumFormula; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class SumFormulaExecutionTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/ViewsFormulaExecutorComponentVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java similarity index 88% rename from server/sonar-server/src/test/java/org/sonar/server/computation/formula/ViewsFormulaExecutorComponentVisitorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java index ee2eb8ecb9c..d41b94c476a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/ViewsFormulaExecutorComponentVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula; +package org.sonar.server.computation.task.projectanalysis.formula; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; @@ -25,18 +25,18 @@ import org.assertj.core.api.AbstractIterableAssert; import org.junit.Rule; import org.junit.Test; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.PathAwareCrawler; -import org.sonar.server.computation.component.ViewsComponent; -import org.sonar.server.computation.formula.counter.IntVariationValue; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepoEntry; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; +import org.sonar.server.computation.task.projectanalysis.formula.counter.IntVariationValue; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolderRule; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; @@ -44,13 +44,13 @@ import static org.sonar.api.measures.CoreMetrics.LINES_KEY; import static org.sonar.api.measures.CoreMetrics.NCLOC_KEY; import static org.sonar.api.measures.CoreMetrics.NEW_IT_COVERAGE_KEY; import static org.sonar.api.measures.CoreMetrics.NEW_LINES_TO_COVER_KEY; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ViewsComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ViewsFormulaExecutorComponentVisitorTest { private static final int ROOT_REF = 1; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/DoubleVariationValueArrayTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleVariationValueArrayTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/DoubleVariationValueArrayTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleVariationValueArrayTest.java index 5c4190acd34..1949be16d11 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/DoubleVariationValueArrayTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleVariationValueArrayTest.java @@ -17,15 +17,15 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.counter; +package org.sonar.server.computation.task.projectanalysis.formula.counter; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import java.util.List; import org.junit.Test; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/DoubleVariationValueTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleVariationValueTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/DoubleVariationValueTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleVariationValueTest.java index 7d50b63abfd..8964971802e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/DoubleVariationValueTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleVariationValueTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.counter; +package org.sonar.server.computation.task.projectanalysis.formula.counter; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/IntSumCounterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounterTest.java similarity index 91% rename from server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/IntSumCounterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounterTest.java index b90daa73fdc..18cf87a7685 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/IntSumCounterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounterTest.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.counter; +package org.sonar.server.computation.task.projectanalysis.formula.counter; import com.google.common.base.Optional; import org.junit.Test; -import org.sonar.server.computation.formula.CounterInitializationContext; -import org.sonar.server.computation.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/IntVariationValueArrayTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntVariationValueArrayTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/IntVariationValueArrayTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntVariationValueArrayTest.java index 5667dcd259d..25aa126d301 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/IntVariationValueArrayTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntVariationValueArrayTest.java @@ -17,15 +17,15 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.counter; +package org.sonar.server.computation.task.projectanalysis.formula.counter; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import java.util.List; import org.junit.Test; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/IntVariationValueTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntVariationValueTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/IntVariationValueTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntVariationValueTest.java index 9281b243912..7cca94fadc7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/IntVariationValueTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntVariationValueTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.counter; +package org.sonar.server.computation.task.projectanalysis.formula.counter; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/LongSumCounterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounterTest.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/LongSumCounterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounterTest.java index 2609a152bc0..2a6f54f0d1c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/LongSumCounterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounterTest.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.counter; +package org.sonar.server.computation.task.projectanalysis.formula.counter; import com.google.common.base.Optional; import org.junit.Test; -import org.sonar.server.computation.formula.CounterInitializationContext; -import org.sonar.server.computation.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/LongVariationValueArrayTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongVariationValueArrayTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/LongVariationValueArrayTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongVariationValueArrayTest.java index a6625fe695b..ea31e62d132 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/LongVariationValueArrayTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongVariationValueArrayTest.java @@ -17,15 +17,15 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.counter; +package org.sonar.server.computation.task.projectanalysis.formula.counter; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import java.util.List; import org.junit.Test; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/LongVariationValueTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongVariationValueTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/LongVariationValueTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongVariationValueTest.java index a4a4e389e26..0a64ffa145a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/LongVariationValueTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongVariationValueTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.counter; +package org.sonar.server.computation.task.projectanalysis.formula.counter; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/coverage/CoverageUtilsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtilsTest.java similarity index 86% rename from server/sonar-server/src/test/java/org/sonar/server/computation/formula/coverage/CoverageUtilsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtilsTest.java index 9d73959ae92..e4b7e7ff563 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/coverage/CoverageUtilsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtilsTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.formula.coverage; +package org.sonar.server.computation.task.projectanalysis.formula.coverage; import com.google.common.base.Optional; import java.util.HashMap; @@ -27,19 +27,19 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.ExternalResource; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.formula.CounterInitializationContext; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.period.Period; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.period.Period; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.formula.coverage.CoverageUtils.getLongMeasureValue; -import static org.sonar.server.computation.formula.coverage.CoverageUtils.getLongVariation; -import static org.sonar.server.computation.formula.coverage.CoverageUtils.getMeasureVariations; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.formula.coverage.CoverageUtils.getLongMeasureValue; +import static org.sonar.server.computation.task.projectanalysis.formula.coverage.CoverageUtils.getLongVariation; +import static org.sonar.server.computation.task.projectanalysis.formula.coverage.CoverageUtils.getMeasureVariations; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; public class CoverageUtilsTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/CloseIssuesOnRemovedComponentsVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitorTest.java similarity index 85% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/CloseIssuesOnRemovedComponentsVisitorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitorTest.java index 1f2d8b7ba80..dbf129f127b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/CloseIssuesOnRemovedComponentsVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.util.Arrays; import java.util.Collections; @@ -28,9 +28,9 @@ import org.junit.rules.TemporaryFolder; import org.sonar.api.utils.System2; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.util.CloseableIterator; -import org.sonar.server.computation.component.ComponentVisitor; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.VisitorsCrawler; +import org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.VisitorsCrawler; import static com.google.common.collect.Sets.newHashSet; import static org.assertj.core.api.Assertions.assertThat; @@ -38,10 +38,10 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; public class CloseIssuesOnRemovedComponentsVisitorTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/ComponentIssuesRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImplTest.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/ComponentIssuesRepositoryImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImplTest.java index 2ae9a6ae95c..8d70e0d840e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/ComponentIssuesRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImplTest.java @@ -17,17 +17,17 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.util.Arrays; import java.util.Collections; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; public class ComponentIssuesRepositoryImplTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/ComponentIssuesRepositoryRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryRule.java similarity index 86% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/ComponentIssuesRepositoryRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryRule.java index a8e1fd32113..c8a9e7fd0a7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/ComponentIssuesRepositoryRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryRule.java @@ -17,23 +17,23 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.util.Collections; import java.util.List; import javax.annotation.CheckForNull; import org.junit.rules.ExternalResource; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; public class ComponentIssuesRepositoryRule extends ExternalResource implements MutableComponentIssuesRepository, ComponentIssuesRepository { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/ComponentsWithUnprocessedIssuesTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssuesTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/ComponentsWithUnprocessedIssuesTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssuesTest.java index 37a39923d2b..47ad46e9c69 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/ComponentsWithUnprocessedIssuesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssuesTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.util.Set; import org.junit.Rule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/DebtCalculatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculatorTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/DebtCalculatorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculatorTest.java index 71de564497f..0953cb47d94 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/DebtCalculatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculatorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import org.junit.Test; import org.sonar.api.config.Settings; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/DefaultAssigneeTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssigneeTest.java similarity index 89% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/DefaultAssigneeTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssigneeTest.java index 4377d055198..616f5918e3a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/DefaultAssigneeTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssigneeTest.java @@ -17,16 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; import org.sonar.api.CoreProperties; import org.sonar.api.config.Settings; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.SettingsRepository; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.SettingsRepository; import org.sonar.server.user.index.UserDoc; import org.sonar.server.user.index.UserIndex; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/DumbRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DumbRule.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/DumbRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DumbRule.java index 9ac77c5c038..3f2d2f1704b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/DumbRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DumbRule.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.util.HashSet; import java.util.Set; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/EffortAggregatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregatorTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/EffortAggregatorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregatorTest.java index 3283c1b7e7d..e17cd780c10 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/EffortAggregatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregatorTest.java @@ -17,15 +17,15 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import org.junit.Test; import org.sonar.api.utils.Duration; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.api.issue.Issue.RESOLUTION_FIXED; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/FillComponentIssuesVisitorRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/FillComponentIssuesVisitorRule.java similarity index 85% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/FillComponentIssuesVisitorRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/FillComponentIssuesVisitorRule.java index 6ac4497f211..023ab2b07a1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/FillComponentIssuesVisitorRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/FillComponentIssuesVisitorRule.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; @@ -25,15 +25,15 @@ import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static java.util.Arrays.asList; -import static org.sonar.server.computation.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; /** * This rule can be used when testing a visitor that depends on {@link ComponentIssuesRepository}. diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IntegrateIssuesVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/IntegrateIssuesVisitorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java index 8d699780485..9e0522264dd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IntegrateIssuesVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.base.Optional; import java.util.Collections; @@ -41,15 +41,15 @@ import org.sonar.db.rule.RuleDto; import org.sonar.db.rule.RuleTesting; import org.sonar.scanner.protocol.Constants; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.TypeAwareVisitor; -import org.sonar.server.computation.filemove.MovedFilesRepository; -import org.sonar.server.computation.issue.commonrule.CommonRuleEngineImpl; -import org.sonar.server.computation.issue.filter.IssueFilter; -import org.sonar.server.computation.qualityprofile.ActiveRulesHolderRule; -import org.sonar.server.computation.source.SourceLinesRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitor; +import org.sonar.server.computation.task.projectanalysis.filemove.MovedFilesRepository; +import org.sonar.server.computation.task.projectanalysis.issue.commonrule.CommonRuleEngineImpl; +import org.sonar.server.computation.task.projectanalysis.issue.filter.IssueFilter; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolderRule; +import org.sonar.server.computation.task.projectanalysis.source.SourceLinesRepositoryRule; import org.sonar.server.issue.IssueTesting; import static com.google.common.collect.Lists.newArrayList; @@ -61,7 +61,7 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.sonar.server.computation.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; public class IntegrateIssuesVisitorTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueAssignerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssignerTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueAssignerTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssignerTest.java index 1d3a3403f98..d38e6cf9564 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueAssignerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssignerTest.java @@ -17,23 +17,23 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import org.junit.Test; import org.sonar.api.rules.RuleType; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.scm.Changeset; -import org.sonar.server.computation.scm.ScmInfoRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.scm.Changeset; +import org.sonar.server.computation.task.projectanalysis.scm.ScmInfoRepositoryRule; import org.sonar.server.issue.IssueUpdater; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.sonar.server.computation.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; public class IssueAssignerTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueCounterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounterTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueCounterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounterTest.java index 9f9aae5e3d0..0ce77251c64 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueCounterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounterTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.util.Date; import javax.annotation.Nullable; @@ -29,16 +29,16 @@ import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rules.RuleType; import org.sonar.core.issue.DefaultIssue; import org.sonar.db.rule.RuleTesting; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricImpl; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolderRule; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricImpl; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolderRule; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.api.issue.Issue.RESOLUTION_FALSE_POSITIVE; @@ -68,8 +68,8 @@ import static org.sonar.api.measures.CoreMetrics.WONT_FIX_ISSUES_KEY; import static org.sonar.api.rule.Severity.BLOCKER; import static org.sonar.api.rule.Severity.CRITICAL; import static org.sonar.api.rule.Severity.MAJOR; -import static org.sonar.server.computation.component.ReportComponent.builder; -import static org.sonar.server.computation.metric.Metric.MetricType.INT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.INT; public class IssueCounterTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueLifecycleTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycleTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueLifecycleTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycleTest.java index edb79bbb0b9..f8145d4eef8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueLifecycleTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycleTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.collect.ImmutableMap; import java.util.Date; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java similarity index 76% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java index ad5d97b90f1..de7ceeeeef2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java @@ -17,23 +17,23 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.util.Arrays; import org.junit.Test; -import org.sonar.server.computation.component.ComponentVisitor; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.VisitorsCrawler; +import org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.VisitorsCrawler; import static com.google.common.collect.Sets.newHashSet; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; public class LoadComponentUuidsHavingOpenIssuesVisitorTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/MovedIssueVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitorTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/MovedIssueVisitorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitorTest.java index a02684b872f..2e2095a5864 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/MovedIssueVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.base.Optional; import java.util.Date; @@ -27,10 +27,10 @@ import org.junit.rules.ExpectedException; import org.mockito.ArgumentCaptor; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.IssueChangeContext; -import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.filemove.MovedFilesRepository; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.filemove.MovedFilesRepository; import org.sonar.server.issue.IssueUpdater; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/NewEffortAggregatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregatorTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/NewEffortAggregatorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregatorTest.java index 697e0744477..86a1b039b7f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/NewEffortAggregatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregatorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import org.junit.Test; import org.mockito.Mockito; @@ -25,13 +25,13 @@ import org.sonar.api.rules.RuleType; import org.sonar.api.utils.Duration; import org.sonar.core.issue.DefaultIssue; import org.sonar.db.DbClient; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolderRule; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/NewEffortCalculatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortCalculatorTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/NewEffortCalculatorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortCalculatorTest.java index 79f3fe42325..d578b871ff9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/NewEffortCalculatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortCalculatorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.util.Arrays; import java.util.Date; @@ -28,7 +28,7 @@ import org.sonar.api.utils.Duration; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.FieldDiffs; import org.sonar.db.issue.IssueChangeDto; -import org.sonar.server.computation.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.Period; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImplTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleRepositoryImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImplTest.java index b482e900d2f..f873187c47c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleRepositoryRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryRule.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleRepositoryRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryRule.java index bf0c5db6158..890093f7da3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleRepositoryRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryRule.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.base.Optional; import java.util.HashMap; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleTagsCopierTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopierTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleTagsCopierTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopierTest.java index 1c75cc6f91c..0f059da223b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleTagsCopierTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopierTest.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.collect.Sets; import java.util.Collections; import org.junit.Test; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleTypeCopierTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopierTest.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleTypeCopierTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopierTest.java index ad392613be2..23862e1f094 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleTypeCopierTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopierTest.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import org.junit.Test; import org.sonar.api.rules.RuleType; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/ScmAccountToUserLoaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/ScmAccountToUserLoaderTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java index 030674412f0..de8301e91da 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/ScmAccountToUserLoaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import java.util.Collections; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/TrackerBaseInputFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactoryTest.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/TrackerBaseInputFactoryTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactoryTest.java index f20dd966f3e..85a2b0e1d12 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/TrackerBaseInputFactoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactoryTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.base.Optional; import org.junit.Before; @@ -25,9 +25,9 @@ import org.junit.Test; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.source.FileSourceDao; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.filemove.MovedFilesRepository; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.filemove.MovedFilesRepository; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/TrackerRawInputFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactoryTest.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/TrackerRawInputFactoryTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactoryTest.java index 0d3491925d7..6f158b53cb6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/TrackerRawInputFactoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactoryTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import com.google.common.collect.Iterators; import java.util.Collection; @@ -31,13 +31,13 @@ import org.sonar.core.issue.tracking.Input; import org.sonar.scanner.protocol.Constants; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.TextRange; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.issue.commonrule.CommonRuleEngine; -import org.sonar.server.computation.issue.filter.IssueFilter; -import org.sonar.server.computation.source.SourceLinesRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.issue.commonrule.CommonRuleEngine; +import org.sonar.server.computation.task.projectanalysis.issue.filter.IssueFilter; +import org.sonar.server.computation.task.projectanalysis.source.SourceLinesRepositoryRule; import org.sonar.server.rule.CommonRuleKeys; import static java.util.Arrays.asList; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/UpdateConflictResolverTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolverTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/UpdateConflictResolverTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolverTest.java index 32ba3aec6a3..007aa1560ec 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/UpdateConflictResolverTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolverTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue; +package org.sonar.server.computation.task.projectanalysis.issue; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/BranchCoverageRuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRuleTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/BranchCoverageRuleTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRuleTest.java index 955f7babbd8..61916a3824c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/BranchCoverageRuleTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRuleTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.commonrule; +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rule.RuleKey; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/CommentDensityRuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRuleTest.java similarity index 86% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/CommentDensityRuleTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRuleTest.java index de600a364fa..bacf258de62 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/CommentDensityRuleTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRuleTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.commonrule; +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; import com.google.common.collect.ImmutableMap; import org.junit.Rule; @@ -27,19 +27,19 @@ import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.FileAttributes; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.qualityprofile.ActiveRule; -import org.sonar.server.computation.qualityprofile.ActiveRulesHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolderRule; import org.sonar.server.rule.CommonRuleKeys; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.ReportComponent.DUMB_PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; public class CommentDensityRuleTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/CommonRuleEngineImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImplTest.java similarity index 85% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/CommonRuleEngineImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImplTest.java index eaf7ca9824b..24abda535fe 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/CommonRuleEngineImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImplTest.java @@ -17,20 +17,20 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.commonrule; +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; import java.util.Collection; import org.junit.Test; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.FileAttributes; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static org.sonar.server.computation.component.ReportComponent.DUMB_PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; public class CommonRuleEngineImplTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/CommonRuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/CommonRuleTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleTest.java index 17b6704770b..2d7eee461ff 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/CommonRuleTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.commonrule; +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; import com.google.common.collect.ImmutableMap; import org.junit.Rule; @@ -25,7 +25,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.rule.Severity; import org.sonar.db.rule.RuleTesting; -import org.sonar.server.computation.qualityprofile.ActiveRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRule; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/CoverageRuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CoverageRuleTest.java similarity index 82% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/CoverageRuleTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CoverageRuleTest.java index 3bbcecafc1b..3a3a602f335 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/CoverageRuleTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CoverageRuleTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.commonrule; +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; import com.google.common.collect.ImmutableMap; import org.junit.Before; @@ -27,18 +27,18 @@ import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.FileAttributes; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.qualityprofile.ActiveRule; -import org.sonar.server.computation.qualityprofile.ActiveRulesHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolderRule; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.ReportComponent.DUMB_PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; public abstract class CoverageRuleTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/DuplicatedBlockRuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRuleTest.java similarity index 77% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/DuplicatedBlockRuleTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRuleTest.java index 2099b83e71e..be3ec0acd4e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/DuplicatedBlockRuleTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRuleTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.commonrule; +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; import java.util.Collections; import org.junit.Rule; @@ -26,19 +26,19 @@ import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.FileAttributes; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.qualityprofile.ActiveRule; -import org.sonar.server.computation.qualityprofile.ActiveRulesHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolderRule; import org.sonar.server.rule.CommonRuleKeys; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.ReportComponent.DUMB_PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; public class DuplicatedBlockRuleTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/LineCoverageRuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRuleTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/LineCoverageRuleTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRuleTest.java index b75fe9f0a7c..449de2e47a1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/LineCoverageRuleTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRuleTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.commonrule; +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rule.RuleKey; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/SkippedTestRuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRuleTest.java similarity index 78% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/SkippedTestRuleTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRuleTest.java index 140f9e3bd7c..9768a74597e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/SkippedTestRuleTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRuleTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.commonrule; +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; import java.util.Collections; import org.junit.Rule; @@ -26,19 +26,19 @@ import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.FileAttributes; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.qualityprofile.ActiveRule; -import org.sonar.server.computation.qualityprofile.ActiveRulesHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolderRule; import org.sonar.server.rule.CommonRuleKeys; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.ReportComponent.DUMB_PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; public class SkippedTestRuleTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/TestErrorRuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRuleTest.java similarity index 80% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/TestErrorRuleTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRuleTest.java index ccaebbfc590..c34ed0400bf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/commonrule/TestErrorRuleTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRuleTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.commonrule; +package org.sonar.server.computation.task.projectanalysis.issue.commonrule; import java.util.Collections; import org.junit.Rule; @@ -26,19 +26,19 @@ import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.FileAttributes; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.qualityprofile.ActiveRule; -import org.sonar.server.computation.qualityprofile.ActiveRulesHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolderRule; import org.sonar.server.rule.CommonRuleKeys; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.ReportComponent.DUMB_PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; public class TestErrorRuleTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/filter/IssueFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilterTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/filter/IssueFilterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilterTest.java index e4fae8291ce..36f61520aa5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/filter/IssueFilterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilterTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.filter; +package org.sonar.server.computation.task.projectanalysis.issue.filter; import com.google.common.base.Joiner; import java.util.ArrayList; @@ -30,16 +30,16 @@ import org.junit.rules.ExpectedException; import org.sonar.api.config.Settings; import org.sonar.api.rule.RuleKey; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.SettingsRepository; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.SettingsRepository; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; public class IssueFilterTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/filter/IssuePatternTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePatternTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/issue/filter/IssuePatternTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePatternTest.java index e0ace6afa66..83c6d03f69f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/filter/IssuePatternTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePatternTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.issue.filter; +package org.sonar.server.computation.task.projectanalysis.issue.filter; import org.junit.Test; import org.sonar.api.rule.RuleKey; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/language/LanguageRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImplTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/language/LanguageRepositoryImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImplTest.java index 02a816b006d..86a65f82ceb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/language/LanguageRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.language; +package org.sonar.server.computation.task.projectanalysis.language; import com.google.common.base.Optional; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/BatchMeasureToMeasureTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasureTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/BatchMeasureToMeasureTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasureTest.java index 9d02c40974c..366d38d25da 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/BatchMeasureToMeasureTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasureTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.base.Optional; import com.tngtech.java.junit.dataprovider.DataProvider; @@ -30,8 +30,8 @@ import org.sonar.scanner.protocol.output.ScannerReport.Measure.DoubleValue; import org.sonar.scanner.protocol.output.ScannerReport.Measure.IntValue; import org.sonar.scanner.protocol.output.ScannerReport.Measure.LongValue; import org.sonar.scanner.protocol.output.ScannerReport.Measure.StringValue; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricImpl; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricImpl; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/BestValueOptimizationTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimizationTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/BestValueOptimizationTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimizationTest.java index cb3662a80b5..704127c0ecb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/BestValueOptimizationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimizationTest.java @@ -17,17 +17,17 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.base.Predicate; import org.junit.Test; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricImpl; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricImpl; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; public class BestValueOptimizationTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MapBasedRawMeasureRepositoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/MapBasedRawMeasureRepositoryTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java index 43840f8e7bc..99e988633fe 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MapBasedRawMeasureRepositoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -40,15 +40,15 @@ import org.sonar.api.utils.System2; import org.sonar.db.DbClient; import org.sonar.db.DbTester; import org.sonar.db.rule.RuleDto; -import org.sonar.server.computation.batch.BatchReportReader; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.Developer; -import org.sonar.server.computation.component.DumbDeveloper; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricImpl; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.metric.ReportMetricValidator; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Developer; +import org.sonar.server.computation.task.projectanalysis.component.DumbDeveloper; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricImpl; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.metric.ReportMetricValidator; import static com.google.common.collect.FluentIterable.from; import static java.lang.String.format; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureAssert.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureAssert.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureAssert.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureAssert.java index c819ef0063b..60f2479dd11 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureAssert.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureAssert.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.base.Optional; import java.util.Objects; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureComputersHolderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImplTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureComputersHolderImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImplTest.java index e9d84fe4319..a905c298e22 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureComputersHolderImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImplTest.java @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.collect.ImmutableList; import java.util.Collections; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.server.computation.measure.api.MeasureComputerWrapper; +import org.sonar.server.computation.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureComputersHolderRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderRule.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureComputersHolderRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderRule.java index 9852bddfba2..8d3d38845b5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureComputersHolderRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderRule.java @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import java.util.ArrayList; import java.util.List; import org.junit.After; import org.junit.rules.ExternalResource; import org.sonar.api.ce.measure.MeasureComputer; -import org.sonar.server.computation.measure.api.MeasureComputerWrapper; +import org.sonar.server.computation.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureDtoToMeasureTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasureTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureDtoToMeasureTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasureTest.java index f92bba6207c..ef34809b2da 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureDtoToMeasureTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasureTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.base.Optional; import com.tngtech.java.junit.dataprovider.DataProvider; @@ -29,9 +29,9 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.sonar.db.measure.MeasureDto; -import org.sonar.server.computation.measure.Measure.Level; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricImpl; +import org.sonar.server.computation.task.projectanalysis.measure.Measure.Level; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricImpl; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureKeyTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKeyTest.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureKeyTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKeyTest.java index 03266abe82f..52c2230776b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureKeyTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKeyTest.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.server.computation.component.Developer; -import org.sonar.server.computation.component.DumbDeveloper; +import org.sonar.server.computation.task.projectanalysis.component.Developer; +import org.sonar.server.computation.task.projectanalysis.component.DumbDeveloper; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureLevelTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureLevelTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureLevelTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureLevelTest.java index deb4149c13a..917e1a592b3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureLevelTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureLevelTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepoEntry.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepoEntry.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepoEntry.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepoEntry.java index 86c143502f3..d69c78a027d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepoEntry.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepoEntry.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Objects; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; /** * This class represents a metric key and an associated measure. diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest.java index 36012489090..12727061e0d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -41,14 +41,14 @@ import org.sonar.db.DbTester; import org.sonar.db.measure.MeasureDto; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.Measure.StringValue; -import org.sonar.server.computation.batch.BatchReportReader; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricImpl; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.metric.ReportMetricValidator; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricImpl; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.metric.ReportMetricValidator; import static com.google.common.collect.FluentIterable.from; import static java.lang.String.format; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryRule.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryRule.java index 755c55ee0b4..0dc4b374a85 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryRule.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -32,16 +32,16 @@ import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.junit.rules.ExternalResource; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ComponentProvider; -import org.sonar.server.computation.component.Developer; -import org.sonar.server.computation.component.DumbDeveloper; -import org.sonar.server.computation.component.NoComponentProvider; -import org.sonar.server.computation.component.TreeComponentProvider; -import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.computation.component.TreeRootHolderComponentProvider; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ComponentProvider; +import org.sonar.server.computation.task.projectanalysis.component.Developer; +import org.sonar.server.computation.task.projectanalysis.component.DumbDeveloper; +import org.sonar.server.computation.task.projectanalysis.component.NoComponentProvider; +import org.sonar.server.computation.task.projectanalysis.component.TreeComponentProvider; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderComponentProvider; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureTest.java index 01fa1dd194b..423c1cbb4ab 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; @@ -30,14 +30,14 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; -import org.sonar.server.computation.component.Developer; -import org.sonar.server.computation.component.DumbDeveloper; -import org.sonar.server.computation.measure.Measure.ValueType; +import org.sonar.server.computation.task.projectanalysis.component.Developer; +import org.sonar.server.computation.task.projectanalysis.component.DumbDeveloper; +import org.sonar.server.computation.task.projectanalysis.measure.Measure.ValueType; import org.sonar.server.util.WrapInSingleElementArray; import static com.google.common.collect.FluentIterable.from; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; @RunWith(DataProviderRunner.class) public class MeasureTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureToMeasureDtoTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDtoTest.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureToMeasureDtoTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDtoTest.java index 9e48357a162..df43e0486c3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureToMeasureDtoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDtoTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; @@ -27,14 +27,14 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.sonar.db.measure.MeasureDto; -import org.sonar.server.computation.analysis.MutableAnalysisMetadataHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.Developer; -import org.sonar.server.computation.component.DumbDeveloper; -import org.sonar.server.computation.component.MutableDbIdsRepositoryRule; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricImpl; +import org.sonar.server.computation.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Developer; +import org.sonar.server.computation.task.projectanalysis.component.DumbDeveloper; +import org.sonar.server.computation.task.projectanalysis.component.MutableDbIdsRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricImpl; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureVariationsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureVariationsTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureVariationsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureVariationsTest.java index 07a95a97096..f3197972cf2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureVariationsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureVariationsTest.java @@ -17,18 +17,18 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import javax.annotation.Nullable; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolder; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolder; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; -import static org.sonar.server.computation.measure.MeasureVariations.newMeasureVariationsBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations.newMeasureVariationsBuilder; public class MeasureVariationsTest { public static final String NO_VARIATION_ERROR_MESSAGE = "There must be at least one variation"; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/QualityGateStatusTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatusTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/QualityGateStatusTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatusTest.java index 2365862e83c..e9faca43aac 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/QualityGateStatusTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatusTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/ReportMeasureComputersVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java similarity index 81% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/ReportMeasureComputersVisitorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java index d607df615e0..cb2e0f3152d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/ReportMeasureComputersVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java @@ -17,21 +17,21 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import java.util.Arrays; import java.util.Collections; import org.junit.Rule; import org.junit.Test; import org.sonar.api.ce.measure.MeasureComputer; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ComponentVisitor; -import org.sonar.server.computation.component.VisitorsCrawler; -import org.sonar.server.computation.issue.ComponentIssuesRepository; -import org.sonar.server.computation.measure.api.MeasureComputerDefinitionImpl; -import org.sonar.server.computation.measure.api.MeasureComputerWrapper; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.component.VisitorsCrawler; +import org.sonar.server.computation.task.projectanalysis.issue.ComponentIssuesRepository; +import org.sonar.server.computation.task.projectanalysis.api.measurecomputer.MeasureComputerDefinitionImpl; +import org.sonar.server.computation.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; @@ -40,14 +40,14 @@ import static org.sonar.api.measures.CoreMetrics.COMMENT_LINES; import static org.sonar.api.measures.CoreMetrics.COMMENT_LINES_KEY; import static org.sonar.api.measures.CoreMetrics.NCLOC; import static org.sonar.api.measures.CoreMetrics.NCLOC_KEY; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ReportComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ReportMeasureComputersVisitorTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/ViewsMeasureComputersVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java similarity index 86% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/ViewsMeasureComputersVisitorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java index eb4675674c7..b8cf902f135 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/ViewsMeasureComputersVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java @@ -17,20 +17,20 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure; +package org.sonar.server.computation.task.projectanalysis.measure; import java.util.Arrays; import org.junit.Rule; import org.junit.Test; import org.sonar.api.ce.measure.MeasureComputer; import org.sonar.api.ce.measure.test.TestMeasureComputerDefinitionContext; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ComponentVisitor; -import org.sonar.server.computation.component.VisitorsCrawler; -import org.sonar.server.computation.issue.ComponentIssuesRepository; -import org.sonar.server.computation.measure.api.MeasureComputerDefinitionImpl; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.component.VisitorsCrawler; +import org.sonar.server.computation.task.projectanalysis.issue.ComponentIssuesRepository; +import org.sonar.server.computation.task.projectanalysis.api.measurecomputer.MeasureComputerDefinitionImpl; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -38,13 +38,13 @@ import static org.sonar.api.measures.CoreMetrics.COMMENT_LINES; import static org.sonar.api.measures.CoreMetrics.COMMENT_LINES_KEY; import static org.sonar.api.measures.CoreMetrics.NCLOC; import static org.sonar.api.measures.CoreMetrics.NCLOC_KEY; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ViewsComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ViewsMeasureComputersVisitorTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/qualitygatedetails/EvaluatedConditionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedConditionTest.java similarity index 89% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/qualitygatedetails/EvaluatedConditionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedConditionTest.java index cc71126ddd9..7491f588d68 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/qualitygatedetails/EvaluatedConditionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedConditionTest.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure.qualitygatedetails; +package org.sonar.server.computation.task.projectanalysis.measure.qualitygatedetails; import org.junit.Test; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.qualitygate.Condition; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.qualitygate.Condition; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/qualitygatedetails/QualityGateDetailsDataTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java similarity index 89% rename from server/sonar-server/src/test/java/org/sonar/server/computation/measure/qualitygatedetails/QualityGateDetailsDataTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java index 6c1cdb9241d..ca78ef7b02c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/qualitygatedetails/QualityGateDetailsDataTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java @@ -17,15 +17,15 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.measure.qualitygatedetails; +package org.sonar.server.computation.task.projectanalysis.measure.qualitygatedetails; import com.google.common.collect.ImmutableList; import java.util.Collections; import org.junit.Test; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricImpl; -import org.sonar.server.computation.qualitygate.Condition; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricImpl; +import org.sonar.server.computation.task.projectanalysis.qualitygate.Condition; import org.sonar.test.JsonAssert; public class QualityGateDetailsDataTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricDtoToMetricTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetricTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricDtoToMetricTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetricTest.java index 4503851acf4..55e08f4dfd3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricDtoToMetricTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetricTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.metric; +package org.sonar.server.computation.task.projectanalysis.metric; import org.junit.Test; import org.sonar.db.metric.MetricDto; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImplTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImplTest.java index aeef58f3675..34b10d7008d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.metric; +package org.sonar.server.computation.task.projectanalysis.metric; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest.java index 51686da4df7..695ef5ae33f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.metric; +package org.sonar.server.computation.task.projectanalysis.metric; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryRule.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryRule.java index a0bf0fb45e5..14cc9ca8ae0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryRule.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.metric; +package org.sonar.server.computation.task.projectanalysis.metric; import java.util.HashMap; import java.util.Map; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/ReportMetricValidatorImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImplTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/metric/ReportMetricValidatorImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImplTest.java index 5c6bcf72f3f..2ac4b575578 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/ReportMetricValidatorImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.metric; +package org.sonar.server.computation.task.projectanalysis.metric; import com.google.common.collect.ImmutableSet; import java.util.Collections; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/period/PeriodPredicatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodPredicatesTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/period/PeriodPredicatesTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodPredicatesTest.java index 825a654232a..352bb06d87f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/period/PeriodPredicatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodPredicatesTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.period; +package org.sonar.server.computation.task.projectanalysis.period; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/period/PeriodTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/period/PeriodTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodTest.java index afaadc2856b..d5bdda36492 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/period/PeriodTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.period; +package org.sonar.server.computation.task.projectanalysis.period; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/period/PeriodsHolderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodsHolderImplTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/period/PeriodsHolderImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodsHolderImplTest.java index f893bc404cd..9d3d64c781d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/period/PeriodsHolderImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodsHolderImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.period; +package org.sonar.server.computation.task.projectanalysis.period; import com.google.common.collect.ImmutableList; import java.util.ArrayList; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/period/PeriodsHolderRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodsHolderRule.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/period/PeriodsHolderRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodsHolderRule.java index bd9a314b23c..d77da1c921d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/period/PeriodsHolderRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodsHolderRule.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.period; +package org.sonar.server.computation.task.projectanalysis.period; import java.util.Arrays; import java.util.List; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/ConditionEvaluatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java similarity index 90% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/ConditionEvaluatorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java index 94a4cbc0875..7c21194c493 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/ConditionEvaluatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java @@ -17,32 +17,32 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricImpl; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricImpl; import static com.google.common.base.Predicates.in; import static com.google.common.base.Predicates.not; import static com.google.common.collect.FluentIterable.from; import static java.util.Arrays.asList; import static org.junit.Assert.fail; -import static org.sonar.server.computation.measure.Measure.Level.ERROR; -import static org.sonar.server.computation.measure.Measure.Level.OK; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.metric.Metric.MetricType; -import static org.sonar.server.computation.qualitygate.Condition.Operator.EQUALS; -import static org.sonar.server.computation.qualitygate.Condition.Operator.GREATER_THAN; -import static org.sonar.server.computation.qualitygate.Condition.Operator.LESS_THAN; -import static org.sonar.server.computation.qualitygate.Condition.Operator.NOT_EQUALS; -import static org.sonar.server.computation.qualitygate.EvaluationResultAssert.assertThat; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.Level.ERROR; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.Level.OK; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType; +import static org.sonar.server.computation.task.projectanalysis.qualitygate.Condition.Operator.EQUALS; +import static org.sonar.server.computation.task.projectanalysis.qualitygate.Condition.Operator.GREATER_THAN; +import static org.sonar.server.computation.task.projectanalysis.qualitygate.Condition.Operator.LESS_THAN; +import static org.sonar.server.computation.task.projectanalysis.qualitygate.Condition.Operator.NOT_EQUALS; +import static org.sonar.server.computation.task.projectanalysis.qualitygate.EvaluationResultAssert.assertThat; public class ConditionEvaluatorTest { @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/ConditionStatusTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatusTest.java similarity index 89% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/ConditionStatusTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatusTest.java index 630f65442ae..6d39ecd8ce2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/ConditionStatusTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatusTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; @@ -28,9 +28,9 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.qualitygate.ConditionStatus.EvaluationStatus.NO_VALUE; -import static org.sonar.server.computation.qualitygate.ConditionStatus.EvaluationStatus.OK; -import static org.sonar.server.computation.qualitygate.ConditionStatus.EvaluationStatus.values; +import static org.sonar.server.computation.task.projectanalysis.qualitygate.ConditionStatus.EvaluationStatus.NO_VALUE; +import static org.sonar.server.computation.task.projectanalysis.qualitygate.ConditionStatus.EvaluationStatus.OK; +import static org.sonar.server.computation.task.projectanalysis.qualitygate.ConditionStatus.EvaluationStatus.values; @RunWith(DataProviderRunner.class) public class ConditionStatusTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/ConditionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/ConditionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionTest.java index fd8394b42b1..715aaada646 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/ConditionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionTest.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.server.computation.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/EvaluationResultAssert.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultAssert.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/EvaluationResultAssert.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultAssert.java index 3e345254cd8..aff262250a2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/EvaluationResultAssert.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultAssert.java @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import java.util.Objects; import org.assertj.core.api.AbstractAssert; -import org.sonar.server.computation.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; class EvaluationResultAssert extends AbstractAssert { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/EvaluationResultTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTest.java similarity index 91% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/EvaluationResultTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTest.java index fb080a3235c..73ffa6f6a49 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/EvaluationResultTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTest.java @@ -17,10 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import org.junit.Test; -import org.sonar.server.computation.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/EvaluationResultTextConverterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterTest.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/EvaluationResultTextConverterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterTest.java index 9ecfabd2812..b63bf02ef20 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/EvaluationResultTextConverterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import com.google.common.collect.ImmutableList; import com.tngtech.java.junit.dataprovider.DataProvider; @@ -33,17 +33,17 @@ import org.junit.runner.RunWith; import org.sonar.api.i18n.I18n; import org.sonar.api.utils.Durations; import org.sonar.core.timemachine.Periods; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricImpl; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolderRule; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricImpl; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolderRule; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.sonar.server.computation.measure.Measure.Level.ERROR; -import static org.sonar.server.computation.measure.Measure.Level.WARN; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.Level.ERROR; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.Level.WARN; @RunWith(DataProviderRunner.class) public class EvaluationResultTextConverterTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/MutableQualityGateHolderRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolderRule.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/MutableQualityGateHolderRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolderRule.java index 16692d5ee6f..685b981ff9d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/MutableQualityGateHolderRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolderRule.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import com.google.common.base.Optional; import org.junit.rules.ExternalResource; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/MutableQualityGateStatusHolderRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolderRule.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/MutableQualityGateStatusHolderRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolderRule.java index 415389748de..9b7754204d8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/MutableQualityGateStatusHolderRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolderRule.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import java.util.Map; import org.junit.rules.ExternalResource; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/QualityGateHolderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImplTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/QualityGateHolderImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImplTest.java index 11ba2a4460e..381742ea376 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/QualityGateHolderImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import java.util.Collections; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/QualityGateHolderRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderRule.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/QualityGateHolderRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderRule.java index e10ff52092b..4c2b424521f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/QualityGateHolderRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderRule.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import com.google.common.base.Optional; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/QualityGateServiceImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImplTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/QualityGateServiceImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImplTest.java index 31df844a5eb..3f3a1ca8184 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/QualityGateServiceImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; @@ -27,8 +27,8 @@ import org.sonar.db.qualitygate.QualityGateConditionDao; import org.sonar.db.qualitygate.QualityGateConditionDto; import org.sonar.db.qualitygate.QualityGateDao; import org.sonar.db.qualitygate.QualityGateDto; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/QualityGateStatusHolderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImplTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/QualityGateStatusHolderImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImplTest.java index f8948646f82..254dc951f83 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/QualityGateStatusHolderImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitygate; +package org.sonar.server.computation.task.projectanalysis.qualitygate; import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitymodel/NewQualityModelMeasuresVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewQualityModelMeasuresVisitorTest.java similarity index 91% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualitymodel/NewQualityModelMeasuresVisitorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewQualityModelMeasuresVisitorTest.java index 35a273cf5db..b01fcfcd602 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitymodel/NewQualityModelMeasuresVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewQualityModelMeasuresVisitorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitymodel; +package org.sonar.server.computation.task.projectanalysis.qualitymodel; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -28,20 +28,20 @@ import org.assertj.core.data.Offset; import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.KeyValueFormat; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ComponentVisitor; -import org.sonar.server.computation.component.FileAttributes; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.VisitorsCrawler; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolderRule; -import org.sonar.server.computation.scm.Changeset; -import org.sonar.server.computation.scm.ScmInfoRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.VisitorsCrawler; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolderRule; +import org.sonar.server.computation.task.projectanalysis.scm.Changeset; +import org.sonar.server.computation.task.projectanalysis.scm.ScmInfoRepositoryRule; import static com.google.common.base.Preconditions.checkArgument; import static org.mockito.Mockito.mock; @@ -52,12 +52,12 @@ import static org.sonar.api.measures.CoreMetrics.NEW_SQALE_DEBT_RATIO; import static org.sonar.api.measures.CoreMetrics.NEW_SQALE_DEBT_RATIO_KEY; import static org.sonar.api.measures.CoreMetrics.NEW_TECHNICAL_DEBT; import static org.sonar.api.measures.CoreMetrics.NEW_TECHNICAL_DEBT_KEY; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureAssert.assertThat; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureAssert.assertThat; public class NewQualityModelMeasuresVisitorTest { private static final String LANGUAGE_1_KEY = "language 1 key"; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitymodel/QualityModelMeasuresVisitorForReportTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/QualityModelMeasuresVisitorForReportTest.java similarity index 90% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualitymodel/QualityModelMeasuresVisitorForReportTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/QualityModelMeasuresVisitorForReportTest.java index caa5d2116f1..66e5155b83b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitymodel/QualityModelMeasuresVisitorForReportTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/QualityModelMeasuresVisitorForReportTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitymodel; +package org.sonar.server.computation.task.projectanalysis.qualitymodel; import java.util.Arrays; import org.junit.Before; @@ -27,17 +27,17 @@ import org.sonar.api.rules.RuleType; import org.sonar.api.utils.Duration; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.util.Uuids; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.FileAttributes; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.VisitorsCrawler; -import org.sonar.server.computation.issue.ComponentIssuesRepositoryRule; -import org.sonar.server.computation.issue.FillComponentIssuesVisitorRule; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.qualitymodel.RatingGrid.Rating; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.VisitorsCrawler; +import org.sonar.server.computation.task.projectanalysis.issue.ComponentIssuesRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.issue.FillComponentIssuesVisitorRule; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingGrid.Rating; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -67,19 +67,19 @@ import static org.sonar.api.rule.Severity.MINOR; import static org.sonar.api.rules.RuleType.BUG; import static org.sonar.api.rules.RuleType.CODE_SMELL; import static org.sonar.api.rules.RuleType.VULNERABILITY; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ReportComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; -import static org.sonar.server.computation.qualitymodel.RatingGrid.Rating.A; -import static org.sonar.server.computation.qualitymodel.RatingGrid.Rating.B; -import static org.sonar.server.computation.qualitymodel.RatingGrid.Rating.C; -import static org.sonar.server.computation.qualitymodel.RatingGrid.Rating.D; -import static org.sonar.server.computation.qualitymodel.RatingGrid.Rating.E; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingGrid.Rating.A; +import static org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingGrid.Rating.B; +import static org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingGrid.Rating.C; +import static org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingGrid.Rating.D; +import static org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingGrid.Rating.E; public class QualityModelMeasuresVisitorForReportTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitymodel/QualityModelMeasuresVisitorForViewsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/QualityModelMeasuresVisitorForViewsTest.java similarity index 85% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualitymodel/QualityModelMeasuresVisitorForViewsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/QualityModelMeasuresVisitorForViewsTest.java index b137625fa64..bab8851905c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitymodel/QualityModelMeasuresVisitorForViewsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/QualityModelMeasuresVisitorForViewsTest.java @@ -17,21 +17,21 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitymodel; +package org.sonar.server.computation.task.projectanalysis.qualitymodel; import java.util.Arrays; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.ComponentVisitor; -import org.sonar.server.computation.component.ViewsComponent; -import org.sonar.server.computation.component.VisitorsCrawler; -import org.sonar.server.computation.issue.ComponentIssuesRepositoryRule; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.qualitymodel.RatingGrid.Rating; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; +import org.sonar.server.computation.task.projectanalysis.component.VisitorsCrawler; +import org.sonar.server.computation.task.projectanalysis.issue.ComponentIssuesRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingGrid.Rating; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -51,18 +51,18 @@ import static org.sonar.api.measures.CoreMetrics.SQALE_RATING; import static org.sonar.api.measures.CoreMetrics.SQALE_RATING_KEY; import static org.sonar.api.measures.CoreMetrics.TECHNICAL_DEBT; import static org.sonar.api.measures.CoreMetrics.TECHNICAL_DEBT_KEY; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ViewsComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; -import static org.sonar.server.computation.qualitymodel.RatingGrid.Rating.A; -import static org.sonar.server.computation.qualitymodel.RatingGrid.Rating.B; -import static org.sonar.server.computation.qualitymodel.RatingGrid.Rating.C; -import static org.sonar.server.computation.qualitymodel.RatingGrid.Rating.D; -import static org.sonar.server.computation.qualitymodel.RatingGrid.Rating.E; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingGrid.Rating.A; +import static org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingGrid.Rating.B; +import static org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingGrid.Rating.C; +import static org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingGrid.Rating.D; +import static org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingGrid.Rating.E; public class QualityModelMeasuresVisitorForViewsTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitymodel/RatingGridTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingGridTest.java similarity index 79% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualitymodel/RatingGridTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingGridTest.java index 68e7c02c16e..82ddf812732 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitymodel/RatingGridTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingGridTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitymodel; +package org.sonar.server.computation.task.projectanalysis.qualitymodel; import org.junit.Before; import org.junit.Rule; @@ -25,11 +25,11 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.qualitymodel.RatingGrid.Rating.A; -import static org.sonar.server.computation.qualitymodel.RatingGrid.Rating.B; -import static org.sonar.server.computation.qualitymodel.RatingGrid.Rating.C; -import static org.sonar.server.computation.qualitymodel.RatingGrid.Rating.D; -import static org.sonar.server.computation.qualitymodel.RatingGrid.Rating.E; +import static org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingGrid.Rating.A; +import static org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingGrid.Rating.B; +import static org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingGrid.Rating.C; +import static org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingGrid.Rating.D; +import static org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingGrid.Rating.E; public class RatingGridTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitymodel/RatingSettingsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingSettingsTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualitymodel/RatingSettingsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingSettingsTest.java index 681714ef674..f60f3d0e7d8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitymodel/RatingSettingsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingSettingsTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualitymodel; +package org.sonar.server.computation.task.projectanalysis.qualitymodel; import org.junit.Before; import org.junit.Rule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualityprofile/ActiveRulesHolderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImplTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualityprofile/ActiveRulesHolderImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImplTest.java index c71373db55c..abf5a88b8fe 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualityprofile/ActiveRulesHolderImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualityprofile; +package org.sonar.server.computation.task.projectanalysis.qualityprofile; import com.google.common.base.Optional; import java.util.Collections; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualityprofile/ActiveRulesHolderRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderRule.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualityprofile/ActiveRulesHolderRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderRule.java index 5a70fa21c78..3cd05272053 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualityprofile/ActiveRulesHolderRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderRule.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualityprofile; +package org.sonar.server.computation.task.projectanalysis.qualityprofile; import com.google.common.base.Optional; import java.util.HashMap; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualityprofile/QualityProfileTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/QualityProfileTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/qualityprofile/QualityProfileTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/QualityProfileTest.java index 5ee5bf07bda..5185dc0b443 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualityprofile/QualityProfileTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/QualityProfileTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.qualityprofile; +package org.sonar.server.computation.task.projectanalysis.qualityprofile; import java.util.Date; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/queue/report/CleanReportQueueListenerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/queue/CleanReportQueueListenerTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/queue/report/CleanReportQueueListenerTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/queue/CleanReportQueueListenerTest.java index 0c2991d48e5..3d3c2bfe560 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/queue/report/CleanReportQueueListenerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/queue/CleanReportQueueListenerTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.queue.report; +package org.sonar.server.computation.task.projectanalysis.queue; import org.junit.Test; import org.sonar.ce.queue.CeTask; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/scm/ChangesetTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ChangesetTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/scm/ChangesetTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ChangesetTest.java index 016a00ac7a7..545200f7bc6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/scm/ChangesetTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ChangesetTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.scm; +package org.sonar.server.computation.task.projectanalysis.scm; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/scm/DbScmInfoTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfoTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/scm/DbScmInfoTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfoTest.java index 2f2a8deaf08..2ec1b8557c8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/scm/DbScmInfoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfoTest.java @@ -17,17 +17,17 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.scm; +package org.sonar.server.computation.task.projectanalysis.scm; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.db.protobuf.DbFileSources; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; -import static org.sonar.server.computation.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; import static org.sonar.server.source.index.FileSourceTesting.newFakeData; public class DbScmInfoTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/scm/ReportScmInfoTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfoTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/scm/ReportScmInfoTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfoTest.java index f08358ee138..d8999ea6203 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/scm/ReportScmInfoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfoTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.scm; +package org.sonar.server.computation.task.projectanalysis.scm; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/scm/ScmInfoImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImplTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/scm/ScmInfoImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImplTest.java index 5d21a0f5e0c..1679b1e302c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/scm/ScmInfoImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.scm; +package org.sonar.server.computation.task.projectanalysis.scm; import com.google.common.collect.Lists; import org.junit.Rule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/scm/ScmInfoRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java similarity index 91% rename from server/sonar-server/src/test/java/org/sonar/server/computation/scm/ScmInfoRepositoryImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java index 83d239feacd..9b0574ff401 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/scm/ScmInfoRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.scm; +package org.sonar.server.computation.task.projectanalysis.scm; import com.google.common.collect.ImmutableList; import com.tngtech.java.junit.dataprovider.DataProvider; @@ -39,24 +39,24 @@ import org.sonar.db.DbTester; import org.sonar.db.protobuf.DbFileSources; import org.sonar.db.source.FileSourceDto; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.batch.BatchReportReader; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.ViewsComponent; -import org.sonar.server.computation.analysis.Analysis; -import org.sonar.server.computation.source.SourceHashRepository; -import org.sonar.server.computation.source.SourceHashRepositoryImpl; -import org.sonar.server.computation.source.SourceLinesRepositoryImpl; +import org.sonar.server.computation.task.projectanalysis.analysis.Analysis; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; +import org.sonar.server.computation.task.projectanalysis.source.SourceHashRepository; +import org.sonar.server.computation.task.projectanalysis.source.SourceHashRepositoryImpl; +import org.sonar.server.computation.task.projectanalysis.source.SourceLinesRepositoryImpl; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.sonar.api.utils.log.LoggerLevel.TRACE; -import static org.sonar.server.computation.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; @RunWith(DataProviderRunner.class) public class ScmInfoRepositoryImplTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/scm/ScmInfoRepositoryRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryRule.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/scm/ScmInfoRepositoryRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryRule.java index ad466c907f2..73a1c037f4d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/scm/ScmInfoRepositoryRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryRule.java @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.scm; +package org.sonar.server.computation.task.projectanalysis.scm; import com.google.common.base.Optional; import java.util.Arrays; import java.util.HashMap; import java.util.Map; import org.junit.rules.ExternalResource; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/ComputeFileSourceDataTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceDataTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/source/ComputeFileSourceDataTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceDataTest.java index cbc5ec0c17b..1ecc4c1c348 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/ComputeFileSourceDataTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceDataTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import com.google.common.collect.Lists; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/CoverageLineReaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/CoverageLineReaderTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/computation/source/CoverageLineReaderTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/CoverageLineReaderTest.java index 881e9a4bed7..dede32111a5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/CoverageLineReaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/CoverageLineReaderTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import java.util.Collections; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/DuplicationLineReaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReaderTest.java similarity index 89% rename from server/sonar-server/src/test/java/org/sonar/server/computation/source/DuplicationLineReaderTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReaderTest.java index cdd5ecf5e9b..9ec7749e4ad 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/DuplicationLineReaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReaderTest.java @@ -17,21 +17,21 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import com.google.common.collect.ImmutableSet; import java.util.Arrays; import java.util.Collections; import org.junit.Test; import org.sonar.db.protobuf.DbFileSources; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.duplication.CrossProjectDuplicate; -import org.sonar.server.computation.duplication.Duplicate; -import org.sonar.server.computation.duplication.Duplication; -import org.sonar.server.computation.duplication.InProjectDuplicate; -import org.sonar.server.computation.duplication.InnerDuplicate; -import org.sonar.server.computation.duplication.TextBlock; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.duplication.CrossProjectDuplicate; +import org.sonar.server.computation.task.projectanalysis.duplication.Duplicate; +import org.sonar.server.computation.task.projectanalysis.duplication.Duplication; +import org.sonar.server.computation.task.projectanalysis.duplication.InProjectDuplicate; +import org.sonar.server.computation.task.projectanalysis.duplication.InnerDuplicate; +import org.sonar.server.computation.task.projectanalysis.duplication.TextBlock; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/HighlightingLineReaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReaderTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/source/HighlightingLineReaderTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReaderTest.java index 124653a77c1..f2da36bb4da 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/HighlightingLineReaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReaderTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import java.util.ArrayList; import java.util.Collections; @@ -31,8 +31,8 @@ import org.sonar.db.protobuf.DbFileSources; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.SyntaxHighlightingRule.HighlightingType; import org.sonar.scanner.protocol.output.ScannerReport.TextRange; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.source.RangeOffsetConverter.RangeOffsetConverterException; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.source.RangeOffsetConverter.RangeOffsetConverterException; import static com.google.common.collect.ImmutableMap.of; import static org.assertj.core.api.Assertions.assertThat; @@ -47,7 +47,7 @@ import static org.sonar.scanner.protocol.output.ScannerReport.SyntaxHighlighting import static org.sonar.scanner.protocol.output.ScannerReport.SyntaxHighlightingRule.HighlightingType.CPP_DOC; import static org.sonar.scanner.protocol.output.ScannerReport.SyntaxHighlightingRule.HighlightingType.HIGHLIGHTING_STRING; import static org.sonar.scanner.protocol.output.ScannerReport.SyntaxHighlightingRule.HighlightingType.KEYWORD; -import static org.sonar.server.computation.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; public class HighlightingLineReaderTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/LastCommitVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitorTest.java similarity index 80% rename from server/sonar-server/src/test/java/org/sonar/server/computation/source/LastCommitVisitorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitorTest.java index e45c5ecf75d..bc3b215048c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/LastCommitVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitorTest.java @@ -17,37 +17,37 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import com.google.common.base.Optional; import com.google.common.collect.Lists; import org.junit.Rule; import org.junit.Test; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ComponentVisitor; -import org.sonar.server.computation.component.FileAttributes; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.ViewsComponent; -import org.sonar.server.computation.component.VisitorsCrawler; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.scm.Changeset; -import org.sonar.server.computation.scm.ScmInfoRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; +import org.sonar.server.computation.task.projectanalysis.component.VisitorsCrawler; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.scm.Changeset; +import org.sonar.server.computation.task.projectanalysis.scm.ScmInfoRepositoryRule; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.api.measures.CoreMetrics.LAST_COMMIT_DATE_KEY; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ViewsComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; public class LastCommitVisitorTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/RangeOffsetConverterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverterTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/source/RangeOffsetConverterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverterTest.java index 77d10666b27..50760e60f8f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/RangeOffsetConverterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverterTest.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.source.RangeOffsetConverter.RangeOffsetConverterException; +import org.sonar.server.computation.task.projectanalysis.source.RangeOffsetConverter.RangeOffsetConverterException; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/ReportIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ReportIteratorTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/source/ReportIteratorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ReportIteratorTest.java index 9be2fb9c096..a2c98306c7b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/ReportIteratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ReportIteratorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import java.io.File; import java.util.NoSuchElementException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/ScmLineReaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ScmLineReaderTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/source/ScmLineReaderTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ScmLineReaderTest.java index f95c8ead0fd..f8fd519b977 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/ScmLineReaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ScmLineReaderTest.java @@ -17,15 +17,15 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import com.google.common.collect.ImmutableList; import java.util.List; import org.junit.Test; import org.sonar.db.protobuf.DbFileSources; -import org.sonar.server.computation.scm.Changeset; -import org.sonar.server.computation.scm.ScmInfo; -import org.sonar.server.computation.scm.ScmInfoImpl; +import org.sonar.server.computation.task.projectanalysis.scm.Changeset; +import org.sonar.server.computation.task.projectanalysis.scm.ScmInfo; +import org.sonar.server.computation.task.projectanalysis.scm.ScmInfoImpl; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/SourceHashRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImplTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/source/SourceHashRepositoryImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImplTest.java index 3ac817b1c6e..7a31996a8e5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/SourceHashRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -33,9 +33,9 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.sonar.core.hash.SourceHashComputer; import org.sonar.core.util.CloseableIterator; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.ViewsComponent; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/SourceLinesRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImplTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/source/SourceLinesRepositoryImplTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImplTest.java index dcf600f0a24..42cee4c3591 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/SourceLinesRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImplTest.java @@ -17,18 +17,18 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.core.util.CloseableIterator; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; public class SourceLinesRepositoryImplTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/SourceLinesRepositoryRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryRule.java similarity index 90% rename from server/sonar-server/src/test/java/org/sonar/server/computation/source/SourceLinesRepositoryRule.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryRule.java index 5f6ee73c78b..cd294692ea3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/SourceLinesRepositoryRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryRule.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; @@ -25,11 +25,11 @@ import java.util.Arrays; import java.util.Collection; import org.junit.rules.ExternalResource; import org.sonar.core.util.CloseableIterator; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import static org.sonar.server.computation.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; public class SourceLinesRepositoryRule extends ExternalResource implements SourceLinesRepository { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/SymbolsLineReaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SymbolsLineReaderTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/computation/source/SymbolsLineReaderTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SymbolsLineReaderTest.java index 023db6eb798..cb5cf6cf995 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/SymbolsLineReaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SymbolsLineReaderTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.source; +package org.sonar.server.computation.task.projectanalysis.source; import java.util.Arrays; import org.junit.Rule; @@ -26,14 +26,14 @@ import org.sonar.api.utils.log.LogTester; import org.sonar.db.protobuf.DbFileSources; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.TextRange; -import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.sonar.api.utils.log.LoggerLevel.WARN; -import static org.sonar.server.computation.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; public class SymbolsLineReaderTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ApplyPermissionsStepTest.java similarity index 91% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ApplyPermissionsStepTest.java index c38db74bef6..f3d32a813ff 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ApplyPermissionsStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.util.List; import java.util.Map; @@ -38,11 +38,12 @@ import org.sonar.db.component.ComponentTesting; import org.sonar.db.permission.PermissionRepository; import org.sonar.db.permission.template.PermissionTemplateDto; import org.sonar.db.user.GroupRoleDto; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.MutableDbIdsRepositoryRule; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.ViewsComponent; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.MutableDbIdsRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; +import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.es.EsTester; import org.sonar.server.issue.index.IssueAuthorizationIndexer; import org.sonar.server.issue.index.IssueIndexDefinition; @@ -50,8 +51,8 @@ import org.sonar.server.issue.index.IssueIndexDefinition; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.db.component.ComponentTesting.newView; import static org.sonar.db.permission.template.PermissionTemplateTesting.newPermissionTemplateDto; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; public class ApplyPermissionsStepTest extends BaseStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/BaseStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BaseStepTest.java similarity index 90% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/BaseStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BaseStepTest.java index a614d90e446..e0f994a9e07 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/BaseStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BaseStepTest.java @@ -17,9 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Test; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/BuildComponentTreeStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/BuildComponentTreeStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java index e9aa39e1217..43d7e2b3ecf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/BuildComponentTreeStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; @@ -35,12 +35,12 @@ import org.sonar.db.component.ComponentDto; import org.sonar.db.component.SnapshotDto; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType; -import org.sonar.server.computation.analysis.AnalysisMetadataHolderImpl; -import org.sonar.server.computation.analysis.MutableAnalysisMetadataHolder; -import org.sonar.server.computation.analysis.MutableAnalysisMetadataHolderRule; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.MutableTreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderImpl; +import org.sonar.server.computation.task.projectanalysis.analysis.MutableAnalysisMetadataHolder; +import org.sonar.server.computation.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.MutableTreeRootHolderRule; import static com.google.common.base.Predicates.in; import static com.google.common.base.Predicates.not; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputeQProfileMeasureStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java similarity index 80% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputeQProfileMeasureStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java index 355de0ff52c..431f6ab787d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputeQProfileMeasureStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.collect.ImmutableMap; import java.util.Arrays; @@ -27,27 +27,27 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.FileAttributes; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.qualityprofile.QPMeasureData; -import org.sonar.server.computation.qualityprofile.QualityProfile; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.QPMeasureData; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.QualityProfile; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.assertj.guava.api.Assertions.assertThat; import static org.sonar.api.measures.CoreMetrics.QUALITY_PROFILES; import static org.sonar.api.measures.CoreMetrics.QUALITY_PROFILES_KEY; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; public class ComputeQProfileMeasureStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/CustomMeasuresCopyStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest.java similarity index 81% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/CustomMeasuresCopyStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest.java index 5179282d64d..afab282d545 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/CustomMeasuresCopyStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Before; import org.junit.Rule; @@ -27,30 +27,30 @@ import org.sonar.db.DbClient; import org.sonar.db.DbTester; import org.sonar.db.measure.custom.CustomMeasureDto; import org.sonar.db.measure.custom.CustomMeasureTesting; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.ViewsComponent; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricImpl; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricImpl; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ReportComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; -import static org.sonar.server.computation.step.CustomMeasuresCopyStep.dtoToMeasure; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.step.CustomMeasuresCopyStep.dtoToMeasure; public class CustomMeasuresCopyStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/DuplicationDataMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStepTest.java similarity index 84% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/DuplicationDataMeasuresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStepTest.java index 49b44b76256..cac37d6388a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/DuplicationDataMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStepTest.java @@ -17,23 +17,24 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.duplication.DuplicationRepositoryRule; -import org.sonar.server.computation.duplication.TextBlock; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.duplication.DuplicationRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.duplication.TextBlock; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; import static org.sonar.api.measures.CoreMetrics.DUPLICATIONS_DATA; import static org.sonar.api.measures.CoreMetrics.DUPLICATIONS_DATA_KEY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; public class DuplicationDataMeasuresStepTest extends BaseStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/EnableAnalysisStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStepTest.java similarity index 89% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/EnableAnalysisStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStepTest.java index e9479f4add8..aba10f8bde1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/EnableAnalysisStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.util.Optional; import org.junit.Rule; @@ -28,12 +28,12 @@ import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentTesting; import org.sonar.db.component.SnapshotDto; import org.sonar.db.component.SnapshotTesting; -import org.sonar.server.computation.analysis.MutableAnalysisMetadataHolderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; public class EnableAnalysisStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ExecuteVisitorsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java similarity index 81% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ExecuteVisitorsStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java index 10301628048..59a0d3616c2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ExecuteVisitorsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java @@ -17,32 +17,32 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.util.Arrays; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ComponentVisitor; -import org.sonar.server.computation.component.CrawlerDepthLimit; -import org.sonar.server.computation.component.PathAwareVisitorAdapter; -import org.sonar.server.computation.component.TypeAwareVisitorAdapter; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricImpl; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor; +import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.server.computation.task.projectanalysis.component.PathAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricImpl; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.api.measures.CoreMetrics.NCLOC; import static org.sonar.api.measures.CoreMetrics.NCLOC_KEY; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ReportComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; public class ExecuteVisitorsStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ExtractReportStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStepTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ExtractReportStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStepTest.java index 29246afb7c8..eb6c586d1e9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ExtractReportStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.io.File; import java.io.IOException; @@ -32,7 +32,7 @@ import org.sonar.api.utils.internal.JUnitTempFolder; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; import org.sonar.db.ce.CeTaskTypes; -import org.sonar.server.computation.batch.MutableBatchReportDirectoryHolder; +import org.sonar.server.computation.task.projectanalysis.batch.MutableBatchReportDirectoryHolder; import org.sonar.ce.queue.CeTask; import org.sonar.ce.queue.report.ReportFiles; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/IndexComponentsStepTest.java similarity index 74% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/IndexComponentsStepTest.java index e39e8a2e71b..b8ad445961f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/IndexComponentsStepTest.java @@ -17,21 +17,22 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; import org.sonar.db.component.ResourceIndexDao; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.ViewsComponent; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; +import org.sonar.server.computation.task.step.ComputationStep; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; public class IndexComponentsStepTest extends BaseStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexIssuesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/IndexIssuesStepTest.java similarity index 80% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexIssuesStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/IndexIssuesStepTest.java index 80a25562617..df1fc8c235f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexIssuesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/IndexIssuesStepTest.java @@ -17,19 +17,17 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; import org.sonar.server.issue.index.IssueIndexer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.sonar.server.computation.component.Component.Type.*; -import static org.sonar.server.computation.component.ReportComponent.*; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.*; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.*; public class IndexIssuesStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/IndexTestsStepTest.java similarity index 87% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/IndexTestsStepTest.java index c4595916cb2..a723d96ad6f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/IndexTestsStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.util.List; import org.elasticsearch.search.SearchHit; @@ -27,9 +27,10 @@ import org.sonar.api.config.Settings; import org.sonar.api.utils.System2; import org.sonar.db.DbClient; import org.sonar.db.DbTester; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.es.EsTester; import org.sonar.server.test.db.TestTesting; import org.sonar.server.test.index.TestDoc; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadCrossProjectDuplicationsRepositoryStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadCrossProjectDuplicationsRepositoryStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java index b1166492bf4..8e1857ac490 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadCrossProjectDuplicationsRepositoryStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.util.ArrayList; import java.util.Arrays; @@ -42,15 +42,16 @@ import org.sonar.db.duplication.DuplicationUnitDto; import org.sonar.duplications.block.Block; import org.sonar.duplications.block.ByteArray; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.FileAttributes; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.duplication.CrossProjectDuplicationStatusHolder; -import org.sonar.server.computation.duplication.IntegrateCrossProjectDuplications; -import org.sonar.server.computation.analysis.Analysis; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.duplication.CrossProjectDuplicationStatusHolder; +import org.sonar.server.computation.task.projectanalysis.duplication.IntegrateCrossProjectDuplications; +import org.sonar.server.computation.task.step.ComputationStep; +import org.sonar.server.computation.task.projectanalysis.analysis.Analysis; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; @@ -59,8 +60,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; public class LoadCrossProjectDuplicationsRepositoryStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadDuplicationsFromReportStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStepTest.java similarity index 87% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadDuplicationsFromReportStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStepTest.java index 6f6f787340c..1df8bf3fe4e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadDuplicationsFromReportStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStepTest.java @@ -17,29 +17,29 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.util.Arrays; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.VisitException; -import org.sonar.server.computation.duplication.DetailedTextBlock; -import org.sonar.server.computation.duplication.Duplicate; -import org.sonar.server.computation.duplication.Duplication; -import org.sonar.server.computation.duplication.DuplicationRepositoryRule; -import org.sonar.server.computation.duplication.InProjectDuplicate; -import org.sonar.server.computation.duplication.InnerDuplicate; -import org.sonar.server.computation.duplication.TextBlock; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.VisitException; +import org.sonar.server.computation.task.projectanalysis.duplication.DetailedTextBlock; +import org.sonar.server.computation.task.projectanalysis.duplication.Duplicate; +import org.sonar.server.computation.task.projectanalysis.duplication.Duplication; +import org.sonar.server.computation.task.projectanalysis.duplication.DuplicationRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.duplication.InProjectDuplicate; +import org.sonar.server.computation.task.projectanalysis.duplication.InnerDuplicate; +import org.sonar.server.computation.task.projectanalysis.duplication.TextBlock; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; import static org.sonar.test.ExceptionCauseMatcher.hasType; public class LoadDuplicationsFromReportStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadMeasureComputersStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStepTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadMeasureComputersStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStepTest.java index 61d09dd0ee7..f898adb02e7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadMeasureComputersStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; @@ -30,8 +30,9 @@ import org.junit.rules.ExpectedException; import org.sonar.api.ce.measure.MeasureComputer; import org.sonar.api.measures.Metric; import org.sonar.api.measures.Metrics; -import org.sonar.server.computation.measure.MeasureComputersHolderImpl; -import org.sonar.server.computation.measure.api.MeasureComputerWrapper; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureComputersHolderImpl; +import org.sonar.server.computation.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadPeriodsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadPeriodsStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest.java index f8cb5f45c5e..d0524a9bd0b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadPeriodsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; @@ -33,14 +33,15 @@ import org.sonar.api.utils.System2; import org.sonar.api.utils.log.LogTester; import org.sonar.db.DbClient; import org.sonar.db.DbTester; -import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.SettingsRepository; -import org.sonar.server.computation.component.ViewsComponent; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolderImpl; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.SettingsRepository; +import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolderImpl; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadQualityProfilesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStepTest.java similarity index 88% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadQualityProfilesStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStepTest.java index 7617467a043..28f03b40c79 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadQualityProfilesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Optional; import org.assertj.core.data.MapEntry; @@ -27,11 +27,11 @@ import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; import org.sonar.scanner.protocol.Constants; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.issue.DumbRule; -import org.sonar.server.computation.issue.RuleRepositoryRule; -import org.sonar.server.computation.qualityprofile.ActiveRule; -import org.sonar.server.computation.qualityprofile.ActiveRulesHolderImpl; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.issue.DumbRule; +import org.sonar.server.computation.task.projectanalysis.issue.RuleRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolderImpl; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadReportAnalysisMetadataHolderStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadReportAnalysisMetadataHolderStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java index dfcc110d6ff..17c1ba89827 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadReportAnalysisMetadataHolderStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java @@ -17,16 +17,17 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.utils.MessageException; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.analysis.MutableAnalysisMetadataHolderRule; -import org.sonar.server.computation.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; import org.sonar.ce.queue.CeTask; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LogScannerContextStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LogScannerContextStepTest.java similarity index 91% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/LogScannerContextStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LogScannerContextStepTest.java index af7504f35da..00dc2c710d5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/LogScannerContextStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LogScannerContextStepTest.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; -import org.sonar.server.computation.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistCrossProjectDuplicationIndexStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java similarity index 88% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistCrossProjectDuplicationIndexStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java index 455ba0fc6eb..c148c94a520 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistCrossProjectDuplicationIndexStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.util.Arrays; import java.util.Collections; @@ -30,12 +30,13 @@ import org.sonar.api.utils.System2; import org.sonar.db.DbClient; import org.sonar.db.DbTester; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.duplication.CrossProjectDuplicationStatusHolder; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.duplication.CrossProjectDuplicationStatusHolder; +import org.sonar.server.computation.task.step.ComputationStep; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDevelopersStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistDevelopersStepTest.java similarity index 89% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDevelopersStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistDevelopersStepTest.java index 9ef1e5b8d54..ca982983dec 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDevelopersStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistDevelopersStepTest.java @@ -17,10 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Test; -import org.sonar.server.computation.developer.PersistDevelopersDelegate; +import org.sonar.server.computation.task.projectanalysis.api.developer.PersistDevelopersDelegate; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest.java similarity index 81% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest.java index ce26f3c8075..c8174631e03 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.collect.ImmutableList; import java.util.Collections; @@ -27,21 +27,22 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; -import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.event.Event; -import org.sonar.server.computation.event.EventRepository; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.event.Event; +import org.sonar.server.computation.task.projectanalysis.event.EventRepository; +import org.sonar.server.computation.task.step.ComputationStep; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; public class PersistEventsStepTest extends BaseStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStepTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStepTest.java index ab745ff41b5..a203c3ea411 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.util.Arrays; import org.junit.Before; @@ -34,18 +34,19 @@ import org.sonar.db.source.FileSourceDto.Type; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType; import org.sonar.scanner.protocol.output.ScannerReport.SyntaxHighlightingRule.HighlightingType; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.duplication.Duplicate; -import org.sonar.server.computation.duplication.Duplication; -import org.sonar.server.computation.duplication.DuplicationRepositoryRule; -import org.sonar.server.computation.duplication.InnerDuplicate; -import org.sonar.server.computation.duplication.TextBlock; -import org.sonar.server.computation.scm.Changeset; -import org.sonar.server.computation.scm.ScmInfoRepositoryRule; -import org.sonar.server.computation.source.SourceLinesRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.duplication.Duplicate; +import org.sonar.server.computation.task.projectanalysis.duplication.Duplication; +import org.sonar.server.computation.task.projectanalysis.duplication.DuplicationRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.duplication.InnerDuplicate; +import org.sonar.server.computation.task.projectanalysis.duplication.TextBlock; +import org.sonar.server.computation.task.projectanalysis.scm.Changeset; +import org.sonar.server.computation.task.projectanalysis.scm.ScmInfoRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.source.SourceLinesRepositoryRule; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest.java index 6a2aca06c0f..73a08c15231 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.After; import org.junit.Before; @@ -41,10 +41,11 @@ import org.sonar.db.issue.IssueDto; import org.sonar.db.rule.RuleDto; import org.sonar.db.rule.RuleTesting; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.issue.IssueCache; -import org.sonar.server.computation.issue.RuleRepositoryImpl; -import org.sonar.server.computation.issue.UpdateConflictResolver; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.issue.IssueCache; +import org.sonar.server.computation.task.projectanalysis.issue.RuleRepositoryImpl; +import org.sonar.server.computation.task.projectanalysis.issue.UpdateConflictResolver; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest.java similarity index 88% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest.java index 8ddabbe23fa..8e2fbf1fd1d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.util.List; import java.util.Map; @@ -30,18 +30,19 @@ import org.sonar.db.DbClient; import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; import org.sonar.db.rule.RuleDto; -import org.sonar.server.computation.analysis.MutableAnalysisMetadataHolderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.Developer; -import org.sonar.server.computation.component.DumbDeveloper; -import org.sonar.server.computation.component.MutableDbIdsRepositoryRule; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.ViewsComponent; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.measure.MeasureToMeasureDto; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.period.Period; +import org.sonar.server.computation.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Developer; +import org.sonar.server.computation.task.projectanalysis.component.DumbDeveloper; +import org.sonar.server.computation.task.projectanalysis.component.MutableDbIdsRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureToMeasureDto; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.api.measures.CoreMetrics.CLASS_COMPLEXITY_DISTRIBUTION; @@ -50,15 +51,15 @@ import static org.sonar.api.measures.CoreMetrics.FILE_COMPLEXITY_DISTRIBUTION; import static org.sonar.api.measures.CoreMetrics.FILE_COMPLEXITY_DISTRIBUTION_KEY; import static org.sonar.api.measures.CoreMetrics.FUNCTION_COMPLEXITY_DISTRIBUTION; import static org.sonar.api.measures.CoreMetrics.FUNCTION_COMPLEXITY_DISTRIBUTION_KEY; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureVariations.newMeasureVariationsBuilder; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations.newMeasureVariationsBuilder; public class PersistMeasuresStepTest extends BaseStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest.java index 5236ad1c64f..f9694cdac5c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.util.Locale; import org.junit.Before; @@ -29,11 +29,12 @@ import org.sonar.db.DbTester; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType; import org.sonar.scanner.protocol.output.ScannerReport.ComponentLink.ComponentLinkType; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.VisitException; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.VisitException; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStepTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStepTest.java index e34d4100381..f23b3e4bf23 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.util.Arrays; import java.util.List; @@ -34,11 +34,12 @@ import org.sonar.db.source.FileSourceDto; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.CoverageDetail; import org.sonar.scanner.protocol.output.ScannerReport.Test.TestStatus; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.FileAttributes; -import org.sonar.server.computation.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PublishTaskResultStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStepTest.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/PublishTaskResultStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStepTest.java index 19c96c742ac..acfac84ed29 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PublishTaskResultStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStepTest.java @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.analysis.MutableAnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; import org.sonar.server.computation.taskprocessor.MutableTaskResultHolder; import org.sonar.server.computation.taskprocessor.MutableTaskResultHolderImpl; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStepTest.java similarity index 88% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStepTest.java index 835d519e14f..4c191040842 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; @@ -33,14 +33,15 @@ import org.sonar.api.config.Settings; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.purge.IdUuidPair; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.MutableDbIdsRepositoryRule; -import org.sonar.server.computation.component.MutableDisabledComponentsHolder; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.SettingsRepository; -import org.sonar.server.computation.component.ViewsComponent; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.MutableDbIdsRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.MutableDisabledComponentsHolder; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.SettingsRepository; +import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; import org.sonar.server.computation.dbcleaner.ProjectCleaner; +import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.util.WrapInSingleElementArray; import static java.util.Arrays.asList; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityGateEventsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStepTest.java similarity index 91% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityGateEventsStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStepTest.java index 13d33348468..08174fed707 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityGateEventsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Optional; import org.junit.Before; @@ -25,16 +25,16 @@ import org.junit.Rule; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.sonar.api.notifications.Notification; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.event.Event; -import org.sonar.server.computation.event.EventRepository; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.measure.QualityGateStatus; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.event.Event; +import org.sonar.server.computation.task.projectanalysis.event.EventRepository; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.measure.QualityGateStatus; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; import org.sonar.server.notification.NotificationService; import static org.assertj.core.api.Assertions.assertThat; @@ -45,9 +45,9 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import static org.sonar.api.measures.CoreMetrics.ALERT_STATUS_KEY; -import static org.sonar.server.computation.measure.Measure.Level.ERROR; -import static org.sonar.server.computation.measure.Measure.Level.OK; -import static org.sonar.server.computation.measure.Measure.Level.WARN; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.Level.ERROR; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.Level.OK; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.Level.WARN; public class QualityGateEventsStepTest { private static final ReportComponent PROJECT_COMPONENT = ReportComponent.builder(Component.Type.PROJECT, 1).setUuid("uuid 1").setKey("key 1") diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityGateLoadingStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateLoadingStepTest.java similarity index 84% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityGateLoadingStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateLoadingStepTest.java index 024c56109ea..ab1e9529d3c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityGateLoadingStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateLoadingStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Optional; import java.util.Collections; @@ -25,15 +25,15 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.config.Settings; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.component.SettingsRepository; -import org.sonar.server.computation.component.VisitException; -import org.sonar.server.computation.qualitygate.Condition; -import org.sonar.server.computation.qualitygate.MutableQualityGateHolderRule; -import org.sonar.server.computation.qualitygate.QualityGate; -import org.sonar.server.computation.qualitygate.QualityGateService; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.component.SettingsRepository; +import org.sonar.server.computation.task.projectanalysis.component.VisitException; +import org.sonar.server.computation.task.projectanalysis.qualitygate.Condition; +import org.sonar.server.computation.task.projectanalysis.qualitygate.MutableQualityGateHolderRule; +import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGate; +import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateService; import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityGateMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStepTest.java similarity index 87% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityGateMeasuresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStepTest.java index 52b985d48a4..5900f768b8b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityGateMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Optional; import java.util.Collections; @@ -32,38 +32,38 @@ import org.junit.rules.ExpectedException; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.measure.qualitygatedetails.EvaluatedCondition; -import org.sonar.server.computation.measure.qualitygatedetails.QualityGateDetailsData; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricImpl; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.qualitygate.Condition; -import org.sonar.server.computation.qualitygate.ConditionStatus; -import org.sonar.server.computation.qualitygate.EvaluationResult; -import org.sonar.server.computation.qualitygate.EvaluationResultTextConverter; -import org.sonar.server.computation.qualitygate.MutableQualityGateStatusHolderRule; -import org.sonar.server.computation.qualitygate.QualityGate; -import org.sonar.server.computation.qualitygate.QualityGateHolderRule; -import org.sonar.server.computation.qualitygate.QualityGateStatus; -import org.sonar.server.computation.qualitygate.QualityGateStatusHolder; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.measure.qualitygatedetails.EvaluatedCondition; +import org.sonar.server.computation.task.projectanalysis.measure.qualitygatedetails.QualityGateDetailsData; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricImpl; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.qualitygate.Condition; +import org.sonar.server.computation.task.projectanalysis.qualitygate.ConditionStatus; +import org.sonar.server.computation.task.projectanalysis.qualitygate.EvaluationResult; +import org.sonar.server.computation.task.projectanalysis.qualitygate.EvaluationResultTextConverter; +import org.sonar.server.computation.task.projectanalysis.qualitygate.MutableQualityGateStatusHolderRule; +import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGate; +import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateHolderRule; +import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateStatus; +import org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateStatusHolder; import static com.google.common.collect.ImmutableList.of; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.sonar.api.measures.CoreMetrics.ALERT_STATUS_KEY; -import static org.sonar.server.computation.measure.Measure.Level.ERROR; -import static org.sonar.server.computation.measure.Measure.Level.OK; -import static org.sonar.server.computation.measure.Measure.Level.WARN; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureAssert.assertThat; -import static org.sonar.server.computation.measure.MeasureVariations.newMeasureVariationsBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.Level.ERROR; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.Level.OK; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.Level.WARN; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureAssert.assertThat; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations.newMeasureVariationsBuilder; public class QualityGateMeasuresStepTest { private static final MetricImpl INT_METRIC_1 = createIntMetric(1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityProfileEventsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStepTest.java similarity index 91% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityProfileEventsStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStepTest.java index 8e9a8455088..9fd7a899dbb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityProfileEventsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Optional; import java.util.Arrays; @@ -37,18 +37,18 @@ import org.sonar.api.measures.CoreMetrics; import org.sonar.api.resources.AbstractLanguage; import org.sonar.api.resources.Language; import org.sonar.core.util.UtcDateUtils; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.event.Event; -import org.sonar.server.computation.event.EventRepository; -import org.sonar.server.computation.language.LanguageRepository; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepository; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.computation.qualityprofile.QPMeasureData; -import org.sonar.server.computation.qualityprofile.QualityProfile; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.event.Event; +import org.sonar.server.computation.task.projectanalysis.event.EventRepository; +import org.sonar.server.computation.task.projectanalysis.language.LanguageRepository; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepository; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.QPMeasureData; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.QualityProfile; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportCommentMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCommentMeasuresStepTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportCommentMeasuresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCommentMeasuresStepTest.java index 1d61260433b..e91144e6912 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportCommentMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCommentMeasuresStepTest.java @@ -17,14 +17,15 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; @@ -42,12 +43,12 @@ import static org.sonar.api.measures.CoreMetrics.PUBLIC_DOCUMENTED_API_DENSITY; import static org.sonar.api.measures.CoreMetrics.PUBLIC_DOCUMENTED_API_DENSITY_KEY; import static org.sonar.api.measures.CoreMetrics.PUBLIC_UNDOCUMENTED_API; import static org.sonar.api.measures.CoreMetrics.PUBLIC_UNDOCUMENTED_API_KEY; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ReportComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; public class ReportCommentMeasuresStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportComplexityMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java similarity index 88% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportComplexityMeasuresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java index 02c8a8172c9..67d4bc666fb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportComplexityMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java @@ -17,14 +17,15 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; @@ -52,14 +53,14 @@ import static org.sonar.api.measures.CoreMetrics.FUNCTION_COMPLEXITY; import static org.sonar.api.measures.CoreMetrics.FUNCTION_COMPLEXITY_DISTRIBUTION; import static org.sonar.api.measures.CoreMetrics.FUNCTION_COMPLEXITY_DISTRIBUTION_KEY; import static org.sonar.api.measures.CoreMetrics.FUNCTION_COMPLEXITY_KEY; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ReportComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ReportComplexityMeasuresStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportComputationStepsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationStepsTest.java similarity index 75% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportComputationStepsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationStepsTest.java index edc8bb0d310..da6a95418fb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportComputationStepsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationStepsTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.collect.Lists; import org.junit.Rule; @@ -25,8 +25,8 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.core.platform.ComponentContainer; import org.sonar.core.platform.ContainerPopulator; -import org.sonar.server.computation.container.ComputeEngineContainer; -import org.sonar.server.computation.container.ComputeEngineContainerImpl; +import org.sonar.server.computation.task.container.TaskContainer; +import org.sonar.server.computation.task.container.TaskContainerImpl; import static org.mockito.Mockito.mock; @@ -39,9 +39,9 @@ public class ReportComputationStepsTest { expectedException.expect(IllegalStateException.class); expectedException.expectMessage("Component not found: " + ExtractReportStep.class); - ComputeEngineContainerImpl computeEngineContainer = new ComputeEngineContainerImpl(new ComponentContainer(), new ContainerPopulator() { + TaskContainerImpl computeEngineContainer = new TaskContainerImpl(new ComponentContainer(), new ContainerPopulator() { @Override - public void populateContainer(ComputeEngineContainer container) { + public void populateContainer(TaskContainer container) { // do nothing } }); @@ -52,7 +52,7 @@ public class ReportComputationStepsTest { @Test public void instances_throws_ISE_if_container_does_not_have_second_step() throws Exception { expectedException.expect(IllegalStateException.class); - expectedException.expectMessage("Component not found: class org.sonar.server.computation.step.LogScannerContextStep"); + expectedException.expectMessage("Component not found: class org.sonar.server.computation.task.projectanalysis.step.LogScannerContextStep"); final ExtractReportStep reportExtractionStep = mock(ExtractReportStep.class); ComponentContainer componentContainer = new ComponentContainer() { @@ -60,9 +60,9 @@ public class ReportComputationStepsTest { addSingleton(reportExtractionStep); } }; - ComputeEngineContainerImpl computeEngineContainer = new ComputeEngineContainerImpl(componentContainer, new ContainerPopulator() { + TaskContainerImpl computeEngineContainer = new TaskContainerImpl(componentContainer, new ContainerPopulator() { @Override - public void populateContainer(ComputeEngineContainer container) { + public void populateContainer(TaskContainer container) { // do nothing } }); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportComputeMeasureVariationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportComputeMeasureVariationsStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java index 76008c40c70..e61d321dcd4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportComputeMeasureVariationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Before; import org.junit.Rule; @@ -30,23 +30,23 @@ import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentTesting; import org.sonar.db.component.SnapshotDto; import org.sonar.db.measure.MeasureDto; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.DumbDeveloper; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricImpl; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolderRule; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.DumbDeveloper; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricImpl; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolderRule; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.db.component.SnapshotTesting.newAnalysis; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; public class ReportComputeMeasureVariationsStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportCoverageMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java similarity index 88% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportCoverageMeasuresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java index 217d063054c..22f15750922 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportCoverageMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java @@ -17,28 +17,28 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.FileAttributes; -import org.sonar.server.computation.formula.coverage.LinesAndConditionsWithUncoveredMetricKeys; -import org.sonar.server.computation.measure.MeasureRepoEntry; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; +import org.sonar.server.computation.task.projectanalysis.formula.coverage.LinesAndConditionsWithUncoveredMetricKeys; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ReportComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ReportCoverageMeasuresStepTest { private static final int ROOT_REF = 1; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportDuplicationMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportDuplicationMeasuresStepTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportDuplicationMeasuresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportDuplicationMeasuresStepTest.java index 7e6913dc793..1dde12c8acf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportDuplicationMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportDuplicationMeasuresStepTest.java @@ -17,15 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.duplication.DuplicationRepositoryRule; -import org.sonar.server.computation.duplication.TextBlock; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.duplication.DuplicationRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.duplication.TextBlock; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.base.Preconditions.checkArgument; import static org.assertj.core.api.Assertions.assertThat; @@ -44,12 +45,12 @@ import static org.sonar.api.measures.CoreMetrics.LINES; import static org.sonar.api.measures.CoreMetrics.LINES_KEY; import static org.sonar.api.measures.CoreMetrics.NCLOC; import static org.sonar.api.measures.CoreMetrics.NCLOC_KEY; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ReportComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; public class ReportDuplicationMeasuresStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportLanguageDistributionMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportLanguageDistributionMeasuresStepTest.java similarity index 84% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportLanguageDistributionMeasuresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportLanguageDistributionMeasuresStepTest.java index 31cac36c2be..d07c3ac8993 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportLanguageDistributionMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportLanguageDistributionMeasuresStepTest.java @@ -17,15 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.FileAttributes; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; @@ -33,12 +34,12 @@ import static org.sonar.api.measures.CoreMetrics.NCLOC; import static org.sonar.api.measures.CoreMetrics.NCLOC_KEY; import static org.sonar.api.measures.CoreMetrics.NCLOC_LANGUAGE_DISTRIBUTION; import static org.sonar.api.measures.CoreMetrics.NCLOC_LANGUAGE_DISTRIBUTION_KEY; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ReportComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; public class ReportLanguageDistributionMeasuresStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportNewCoverageMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportNewCoverageMeasuresStepTest.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportNewCoverageMeasuresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportNewCoverageMeasuresStepTest.java index 11fa3a99af8..59a4f56d1ad 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportNewCoverageMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportNewCoverageMeasuresStepTest.java @@ -17,27 +17,27 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import javax.annotation.Nullable; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.FileAttributes; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.formula.coverage.LinesAndConditionsWithUncoveredMetricKeys; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepoEntry; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolderRule; -import org.sonar.server.computation.scm.Changeset; -import org.sonar.server.computation.scm.ScmInfoRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.formula.coverage.LinesAndConditionsWithUncoveredMetricKeys; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolderRule; +import org.sonar.server.computation.task.projectanalysis.scm.Changeset; +import org.sonar.server.computation.task.projectanalysis.scm.ScmInfoRepositoryRule; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; @@ -49,15 +49,15 @@ import static org.sonar.api.measures.CoreMetrics.NEW_LINES_TO_COVER_KEY; import static org.sonar.api.measures.CoreMetrics.NEW_UNCOVERED_CONDITIONS_KEY; import static org.sonar.api.measures.CoreMetrics.NEW_UNCOVERED_LINES_KEY; import static org.sonar.api.utils.DateUtils.parseDate; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ReportComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; -import static org.sonar.server.computation.measure.MeasureVariations.newMeasureVariationsBuilder; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations.newMeasureVariationsBuilder; public class ReportNewCoverageMeasuresStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportPersistAnalysisStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistAnalysisStepTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportPersistAnalysisStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistAnalysisStepTest.java index f525378f924..2ebd03163c3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportPersistAnalysisStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistAnalysisStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.util.List; import org.junit.Before; @@ -32,13 +32,14 @@ import org.sonar.db.component.ComponentTesting; import org.sonar.db.component.SnapshotDto; import org.sonar.db.component.SnapshotQuery; import org.sonar.db.component.SnapshotTesting; -import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.DbIdsRepositoryImpl; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolderRule; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.DbIdsRepositoryImpl; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolderRule; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportPersistComponentsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportPersistComponentsStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java index 49408590951..75b59ea40e1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportPersistComponentsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import com.google.common.base.Optional; import java.text.SimpleDateFormat; @@ -31,21 +31,22 @@ import org.sonar.db.DbClient; import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentTesting; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.FileAttributes; -import org.sonar.server.computation.component.MutableDbIdsRepositoryRule; -import org.sonar.server.computation.component.MutableDisabledComponentsHolder; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; +import org.sonar.server.computation.task.projectanalysis.component.MutableDbIdsRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.MutableDisabledComponentsHolder; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; public class ReportPersistComponentsStepTest extends BaseStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportSizeMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportSizeMeasuresStepTest.java similarity index 88% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportSizeMeasuresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportSizeMeasuresStepTest.java index 92e97d8105a..a6f08ac2361 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportSizeMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportSizeMeasuresStepTest.java @@ -17,17 +17,17 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import javax.annotation.Nullable; import org.junit.Rule; import org.junit.Test; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.FileAttributes; -import org.sonar.server.computation.measure.MeasureRepoEntry; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; import static com.google.common.base.Predicates.notNull; import static com.google.common.collect.FluentIterable.from; @@ -42,14 +42,14 @@ import static org.sonar.api.measures.CoreMetrics.GENERATED_LINES_KEY; import static org.sonar.api.measures.CoreMetrics.LINES_KEY; import static org.sonar.api.measures.CoreMetrics.NCLOC_KEY; import static org.sonar.api.measures.CoreMetrics.STATEMENTS_KEY; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ReportComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ReportSizeMeasuresStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportUnitTestMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportUnitTestMeasuresStepTest.java similarity index 92% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportUnitTestMeasuresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportUnitTestMeasuresStepTest.java index a50da41f052..7260260f283 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportUnitTestMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportUnitTestMeasuresStepTest.java @@ -17,15 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.assertj.core.data.Offset; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.FileAttributes; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; @@ -41,14 +42,14 @@ import static org.sonar.api.measures.CoreMetrics.TEST_FAILURES; import static org.sonar.api.measures.CoreMetrics.TEST_FAILURES_KEY; import static org.sonar.api.measures.CoreMetrics.TEST_SUCCESS_DENSITY; import static org.sonar.api.measures.CoreMetrics.TEST_SUCCESS_DENSITY_KEY; -import static org.sonar.server.computation.component.Component.Type.DIRECTORY; -import static org.sonar.server.computation.component.Component.Type.FILE; -import static org.sonar.server.computation.component.Component.Type.MODULE; -import static org.sonar.server.computation.component.Component.Type.PROJECT; -import static org.sonar.server.computation.component.ReportComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ReportUnitTestMeasuresStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStepTest.java similarity index 91% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStepTest.java index f110769f80c..368ac6caa5d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.util.Date; import org.junit.Before; @@ -29,12 +29,13 @@ import org.sonar.api.rule.Severity; import org.sonar.api.utils.Duration; import org.sonar.api.utils.System2; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.Component.Type; -import org.sonar.server.computation.issue.IssueCache; -import org.sonar.server.computation.issue.RuleRepository; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.Component.Type; +import org.sonar.server.computation.task.projectanalysis.issue.IssueCache; +import org.sonar.server.computation.task.projectanalysis.issue.RuleRepository; +import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.issue.notification.IssueChangeNotification; import org.sonar.server.issue.notification.MyNewIssuesNotification; import org.sonar.server.issue.notification.NewIssuesNotification; @@ -50,7 +51,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.sonar.server.computation.component.ReportComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; public class SendIssueNotificationsStepTest extends BaseStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/UpdateQualityProfilesLastUsedDateStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java similarity index 88% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/UpdateQualityProfilesLastUsedDateStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java index 244c01973aa..51eb9607698 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/UpdateQualityProfilesLastUsedDateStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.util.Arrays; import java.util.Date; @@ -34,15 +34,15 @@ import org.sonar.db.DbTester; import org.sonar.db.RowNotFoundException; import org.sonar.db.qualityprofile.QualityProfileDbTester; import org.sonar.db.qualityprofile.QualityProfileDto; -import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.qualityprofile.QPMeasureData; -import org.sonar.server.computation.qualityprofile.QualityProfile; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.QPMeasureData; +import org.sonar.server.computation.task.projectanalysis.qualityprofile.QualityProfile; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.api.measures.CoreMetrics.QUALITY_PROFILES; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStepTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStepTest.java index 9ca9a3e7f87..39dcf05161a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.util.Date; import org.junit.Rule; @@ -33,11 +33,11 @@ import org.sonar.db.component.ComponentTesting; import org.sonar.db.component.SnapshotTesting; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType; -import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ReportComponent; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; public class ValidateProjectStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsCommentMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCommentMeasuresStepTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsCommentMeasuresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCommentMeasuresStepTest.java index 949ea721543..b36819ffb0c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsCommentMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCommentMeasuresStepTest.java @@ -17,14 +17,15 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; @@ -42,11 +43,11 @@ import static org.sonar.api.measures.CoreMetrics.PUBLIC_DOCUMENTED_API_DENSITY; import static org.sonar.api.measures.CoreMetrics.PUBLIC_DOCUMENTED_API_DENSITY_KEY; import static org.sonar.api.measures.CoreMetrics.PUBLIC_UNDOCUMENTED_API; import static org.sonar.api.measures.CoreMetrics.PUBLIC_UNDOCUMENTED_API_KEY; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ViewsComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; public class ViewsCommentMeasuresStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsComplexityMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java similarity index 88% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsComplexityMeasuresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java index d044c8b2426..9a1ee04a03b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsComplexityMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java @@ -17,14 +17,15 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; @@ -52,13 +53,13 @@ import static org.sonar.api.measures.CoreMetrics.FUNCTION_COMPLEXITY; import static org.sonar.api.measures.CoreMetrics.FUNCTION_COMPLEXITY_DISTRIBUTION; import static org.sonar.api.measures.CoreMetrics.FUNCTION_COMPLEXITY_DISTRIBUTION_KEY; import static org.sonar.api.measures.CoreMetrics.FUNCTION_COMPLEXITY_KEY; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ViewsComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ViewsComplexityMeasuresStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsComputeMeasureVariationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComputeMeasureVariationsStepTest.java similarity index 91% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsComputeMeasureVariationsStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComputeMeasureVariationsStepTest.java index 584edf8e72d..f041e723498 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsComputeMeasureVariationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComputeMeasureVariationsStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Before; import org.junit.Rule; @@ -30,17 +30,17 @@ import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentTesting; import org.sonar.db.component.SnapshotDto; import org.sonar.db.measure.MeasureDto; -import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ViewsComponent; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.Metric; -import org.sonar.server.computation.metric.MetricImpl; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolderRule; +import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.server.computation.task.projectanalysis.metric.MetricImpl; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolderRule; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.db.component.SnapshotTesting.newAnalysis; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsCoverageMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCoverageMeasuresStepTest.java similarity index 90% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsCoverageMeasuresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCoverageMeasuresStepTest.java index d5efdf99b94..ae7fb433fb5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsCoverageMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCoverageMeasuresStepTest.java @@ -17,26 +17,26 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.formula.coverage.LinesAndConditionsWithUncoveredMetricKeys; -import org.sonar.server.computation.measure.MeasureRepoEntry; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.formula.coverage.LinesAndConditionsWithUncoveredMetricKeys; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ViewsComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ViewsCoverageMeasuresStepTest { private static final int ROOT_REF = 1; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsDuplicationMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsDuplicationMeasuresStepTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsDuplicationMeasuresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsDuplicationMeasuresStepTest.java index 5f57ff4526d..88356d549a0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsDuplicationMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsDuplicationMeasuresStepTest.java @@ -17,13 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; @@ -41,11 +42,11 @@ import static org.sonar.api.measures.CoreMetrics.LINES; import static org.sonar.api.measures.CoreMetrics.LINES_KEY; import static org.sonar.api.measures.CoreMetrics.NCLOC; import static org.sonar.api.measures.CoreMetrics.NCLOC_KEY; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ViewsComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; public class ViewsDuplicationMeasuresStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsLanguageDistributionMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsLanguageDistributionMeasuresStepTest.java similarity index 84% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsLanguageDistributionMeasuresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsLanguageDistributionMeasuresStepTest.java index f17a45b3cf1..c8b7a40eeef 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsLanguageDistributionMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsLanguageDistributionMeasuresStepTest.java @@ -17,23 +17,24 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; import static org.sonar.api.measures.CoreMetrics.NCLOC_LANGUAGE_DISTRIBUTION; import static org.sonar.api.measures.CoreMetrics.NCLOC_LANGUAGE_DISTRIBUTION_KEY; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ViewsComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; public class ViewsLanguageDistributionMeasuresStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsNewCoverageMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsNewCoverageMeasuresStepTest.java similarity index 89% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsNewCoverageMeasuresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsNewCoverageMeasuresStepTest.java index 6695405f49c..a1e47313ff3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsNewCoverageMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsNewCoverageMeasuresStepTest.java @@ -17,34 +17,34 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import javax.annotation.Nullable; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.ViewsComponent; -import org.sonar.server.computation.formula.coverage.LinesAndConditionsWithUncoveredMetricKeys; -import org.sonar.server.computation.measure.Measure; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.measure.MeasureVariations; -import org.sonar.server.computation.metric.MetricRepositoryRule; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; +import org.sonar.server.computation.task.projectanalysis.formula.coverage.LinesAndConditionsWithUncoveredMetricKeys; +import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolderRule; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; import static org.sonar.api.utils.DateUtils.parseDate; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ViewsComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; -import static org.sonar.server.computation.measure.MeasureVariations.newMeasureVariationsBuilder; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureVariations.newMeasureVariationsBuilder; public class ViewsNewCoverageMeasuresStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsPersistAnalysisStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistAnalysisStepTest.java similarity index 85% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsPersistAnalysisStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistAnalysisStepTest.java index e50f5c7a14f..73b0c1ba60f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsPersistAnalysisStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistAnalysisStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.util.List; import org.junit.Before; @@ -30,12 +30,13 @@ import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; import org.sonar.db.component.SnapshotDto; import org.sonar.db.component.SnapshotQuery; -import org.sonar.server.computation.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ViewsComponent; -import org.sonar.server.computation.period.Period; -import org.sonar.server.computation.period.PeriodsHolderRule; +import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; +import org.sonar.server.computation.task.projectanalysis.period.Period; +import org.sonar.server.computation.task.projectanalysis.period.PeriodsHolderRule; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -44,9 +45,9 @@ import static org.sonar.core.config.CorePropertyDefinitions.TIMEMACHINE_MODE_DAT import static org.sonar.db.component.ComponentTesting.newProjectDto; import static org.sonar.db.component.ComponentTesting.newSubView; import static org.sonar.db.component.ComponentTesting.newView; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; public class ViewsPersistAnalysisStepTest extends BaseStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsPersistComponentsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistComponentsStepTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsPersistComponentsStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistComponentsStepTest.java index ef1485d05d0..89ac0e55bfb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsPersistComponentsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistComponentsStepTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import java.text.SimpleDateFormat; import java.util.Date; @@ -32,21 +32,22 @@ import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDbTester; import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentTesting; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.component.MutableDbIdsRepositoryRule; -import org.sonar.server.computation.component.MutableDisabledComponentsHolder; -import org.sonar.server.computation.component.ProjectViewAttributes; -import org.sonar.server.computation.component.ViewsComponent; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.component.MutableDbIdsRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.MutableDisabledComponentsHolder; +import org.sonar.server.computation.task.projectanalysis.component.ProjectViewAttributes; +import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.sonar.db.component.ComponentTesting.newProjectDto; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ViewsComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ViewsComponent.builder; public class ViewsPersistComponentsStepTest extends BaseStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsSizeMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsSizeMeasuresStepTest.java similarity index 90% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsSizeMeasuresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsSizeMeasuresStepTest.java index 2e691f4e7b4..082d7daec06 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsSizeMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsSizeMeasuresStepTest.java @@ -17,16 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import javax.annotation.Nullable; import org.junit.Rule; import org.junit.Test; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.measure.MeasureRepoEntry; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; import static com.google.common.base.Predicates.notNull; import static com.google.common.collect.FluentIterable.from; @@ -41,13 +41,13 @@ import static org.sonar.api.measures.CoreMetrics.GENERATED_LINES_KEY; import static org.sonar.api.measures.CoreMetrics.LINES_KEY; import static org.sonar.api.measures.CoreMetrics.NCLOC_KEY; import static org.sonar.api.measures.CoreMetrics.STATEMENTS_KEY; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ViewsComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ViewsSizeMeasuresStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsUnitTestMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsUnitTestMeasuresStepTest.java similarity index 91% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsUnitTestMeasuresStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsUnitTestMeasuresStepTest.java index 4b8e75a232c..d626cb247b3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsUnitTestMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsUnitTestMeasuresStepTest.java @@ -17,13 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.batch.TreeRootHolderRule; -import org.sonar.server.computation.measure.MeasureRepositoryRule; -import org.sonar.server.computation.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; @@ -39,13 +40,13 @@ import static org.sonar.api.measures.CoreMetrics.TEST_FAILURES; import static org.sonar.api.measures.CoreMetrics.TEST_FAILURES_KEY; import static org.sonar.api.measures.CoreMetrics.TEST_SUCCESS_DENSITY; import static org.sonar.api.measures.CoreMetrics.TEST_SUCCESS_DENSITY_KEY; -import static org.sonar.server.computation.component.Component.Type.PROJECT_VIEW; -import static org.sonar.server.computation.component.Component.Type.SUBVIEW; -import static org.sonar.server.computation.component.Component.Type.VIEW; -import static org.sonar.server.computation.component.ViewsComponent.builder; -import static org.sonar.server.computation.measure.Measure.newMeasureBuilder; -import static org.sonar.server.computation.measure.MeasureRepoEntry.entryOf; -import static org.sonar.server.computation.measure.MeasureRepoEntry.toEntries; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.server.computation.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ViewsUnitTestMeasuresStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepExecutorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/step/ComputationStepExecutorTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepExecutorTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/step/ComputationStepExecutorTest.java index 153d8f29740..a1858b51da7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepExecutorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/step/ComputationStepExecutorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.step; +package org.sonar.server.computation.task.step; import java.util.Arrays; import java.util.List; @@ -27,6 +27,9 @@ import org.junit.rules.ExpectedException; import org.mockito.InOrder; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; +import org.sonar.server.computation.task.step.ComputationStep; +import org.sonar.server.computation.task.step.ComputationStepExecutor; +import org.sonar.server.computation.task.step.ComputationSteps; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/container/StepsExplorer.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/step/StepsExplorer.java similarity index 89% rename from server/sonar-server/src/test/java/org/sonar/server/computation/container/StepsExplorer.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/task/step/StepsExplorer.java index ea68d77f187..1ae6e7f62a9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/container/StepsExplorer.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/step/StepsExplorer.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.container; +package org.sonar.server.computation.task.step; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -25,17 +25,16 @@ import java.lang.reflect.Modifier; import java.util.Set; import javax.annotation.Nonnull; import org.reflections.Reflections; -import org.sonar.server.computation.step.ComputationStep; import static com.google.common.base.Predicates.notNull; import static com.google.common.collect.FluentIterable.from; public class StepsExplorer { /** - * Compute set of canonical names of classes implementing ComputationStep in package step using reflection. + * Compute set of canonical names of classes implementing ComputationStep in the specified package using reflection. */ - public static Set retrieveStepPackageStepsCanonicalNames() { - Reflections reflections = new Reflections("org.sonar.server.computation.step"); + public static Set retrieveStepPackageStepsCanonicalNames(String packageName) { + Reflections reflections = new Reflections(packageName); return from(reflections.getSubTypesOf(ComputationStep.class)) .filter(NotAbstractClass.INSTANCE) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/taskprocessor/CeWorkerCallableImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/taskprocessor/CeWorkerCallableImplTest.java index 956de0a1585..e9b41a03b07 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/taskprocessor/CeWorkerCallableImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/taskprocessor/CeWorkerCallableImplTest.java @@ -33,7 +33,7 @@ import org.sonar.ce.queue.CeTask; import org.sonar.db.ce.CeActivityDto; import org.sonar.db.ce.CeTaskTypes; import org.sonar.server.computation.queue.InternalCeQueue; -import org.sonar.server.computation.taskprocessor.report.ReportTaskProcessor; +import org.sonar.server.computation.task.projectanalysis.taskprocessor.ReportTaskProcessor; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doThrow; diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/activity/ActivityManagerTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/activity/ActivityManagerTest/shared.xml deleted file mode 100644 index 88c7f807e33..00000000000 --- a/server/sonar-server/src/test/resources/org/sonar/server/computation/activity/ActivityManagerTest/shared.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/1235_add_component_uuid_to_duplications_index.rb b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1235_add_component_uuid_to_duplications_index.rb similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/1235_add_component_uuid_to_duplications_index.rb rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1235_add_component_uuid_to_duplications_index.rb diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/1236_populate_component_uuid_of_duplications_index.rb b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1236_populate_component_uuid_of_duplications_index.rb similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/1236_populate_component_uuid_of_duplications_index.rb rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1236_populate_component_uuid_of_duplications_index.rb diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/1237_delete_orphan_duplications_index_rows_without_component.rb b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1237_delete_orphan_duplications_index_rows_without_component.rb similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/1237_delete_orphan_duplications_index_rows_without_component.rb rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1237_delete_orphan_duplications_index_rows_without_component.rb diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/1238_make_component_uuid_not_null_on_duplications_index.rb b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1238_make_component_uuid_not_null_on_duplications_index.rb similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/1238_make_component_uuid_not_null_on_duplications_index.rb rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1238_make_component_uuid_not_null_on_duplications_index.rb diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/1239_add_analysis_uuid_to_duplications_index.rb b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1239_add_analysis_uuid_to_duplications_index.rb similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/1239_add_analysis_uuid_to_duplications_index.rb rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1239_add_analysis_uuid_to_duplications_index.rb diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/1240_populate_analysis_uuid_of_duplications_index.rb b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1240_populate_analysis_uuid_of_duplications_index.rb similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/1240_populate_analysis_uuid_of_duplications_index.rb rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1240_populate_analysis_uuid_of_duplications_index.rb diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/1241_delete_orphan_duplications_index_rows_without_analysis.rb b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1241_delete_orphan_duplications_index_rows_without_analysis.rb similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/1241_delete_orphan_duplications_index_rows_without_analysis.rb rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1241_delete_orphan_duplications_index_rows_without_analysis.rb diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/1242_make_analysis_uuid_not_null_on_duplications_index.rb b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1242_make_analysis_uuid_not_null_on_duplications_index.rb similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/1242_make_analysis_uuid_not_null_on_duplications_index.rb rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1242_make_analysis_uuid_not_null_on_duplications_index.rb diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/AddAnalysisUuidColumnToDuplicationsIndex.java b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddAnalysisUuidColumnToDuplicationsIndex.java similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/AddAnalysisUuidColumnToDuplicationsIndex.java rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddAnalysisUuidColumnToDuplicationsIndex.java diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/AddComponentUuidColumnToDuplicationsIndex.java b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddComponentUuidColumnToDuplicationsIndex.java similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/AddComponentUuidColumnToDuplicationsIndex.java rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddComponentUuidColumnToDuplicationsIndex.java diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v2/1235_add_component_uuid_and_analysis_uuid_to_duplications_index.rb b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1235_add_component_uuid_and_analysis_uuid_to_duplications_index.rb similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v2/1235_add_component_uuid_and_analysis_uuid_to_duplications_index.rb rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1235_add_component_uuid_and_analysis_uuid_to_duplications_index.rb diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v2/1236_populate_component_uuid_and_analysis_uuid_of_duplications_index.rb b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1236_populate_component_uuid_and_analysis_uuid_of_duplications_index.rb similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v2/1236_populate_component_uuid_and_analysis_uuid_of_duplications_index.rb rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1236_populate_component_uuid_and_analysis_uuid_of_duplications_index.rb diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v2/1237_delete_orphan_duplications_index_rows_without_component_or_analysis.rb b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1237_delete_orphan_duplications_index_rows_without_component_or_analysis.rb similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v2/1237_delete_orphan_duplications_index_rows_without_component_or_analysis.rb rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1237_delete_orphan_duplications_index_rows_without_component_or_analysis.rb diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v2/1238_make_component_uuid_and_analysis_uuid_not_null_on_duplications_index.rb b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1238_make_component_uuid_and_analysis_uuid_not_null_on_duplications_index.rb similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v2/1238_make_component_uuid_and_analysis_uuid_not_null_on_duplications_index.rb rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1238_make_component_uuid_and_analysis_uuid_not_null_on_duplications_index.rb diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v2/AddComponentUuidAndAnalysisUuidColumnToDuplicationsIndex.java b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/AddComponentUuidAndAnalysisUuidColumnToDuplicationsIndex.java similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v2/AddComponentUuidAndAnalysisUuidColumnToDuplicationsIndex.java rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/AddComponentUuidAndAnalysisUuidColumnToDuplicationsIndex.java diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v2/MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex.java b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex.java similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/filemove/FileMoveDetectionStepTest/v2/MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex.java rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex.java diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/issue/ScmAccountToUserLoaderTest/charlie.json b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/issue/ScmAccountToUserLoaderTest/charlie.json rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/issue/ScmAccountToUserLoaderTest/charlie_conflict.json b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie_conflict.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/issue/ScmAccountToUserLoaderTest/charlie_conflict.json rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie_conflict.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/issue/SourceLinesCacheTest/load_data.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/SourceLinesCacheTest/load_data.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/issue/SourceLinesCacheTest/load_data.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/SourceLinesCacheTest/load_data.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/measure/MeasureRepositoryImplTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest/shared.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/measure/MeasureRepositoryImplTest/shared.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest/shared.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/measure/MetricCacheTest/metrics.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/measure/MetricCacheTest/metrics.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/measure/MetricCacheTest/metrics.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/measure/MetricCacheTest/metrics.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/metric/MetricRepositoryImplTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest/shared.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/metric/MetricRepositoryImplTest/shared.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest/shared.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/CustomMeasuresCopyStepTest/report-custom-measures.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest/report-custom-measures.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/CustomMeasuresCopyStepTest/report-custom-measures.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest/report-custom-measures.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/CustomMeasuresCopyStepTest/view-custom-measures.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest/view-custom-measures.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/CustomMeasuresCopyStepTest/view-custom-measures.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest/view-custom-measures.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/IndexSourceLinesStepTest/index_source.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/IndexSourceLinesStepTest/index_source.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/IndexSourceLinesStepTest/index_source.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/IndexSourceLinesStepTest/index_source.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/IndexTestsStepTest/index_source.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/IndexTestsStepTest/index_source.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/IndexTestsStepTest/index_source.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/IndexTestsStepTest/index_source.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/LoadPeriodsStepTest/empty.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/empty.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/LoadPeriodsStepTest/empty.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/empty.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/LoadPeriodsStepTest/no_previous_version.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/no_previous_version.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/LoadPeriodsStepTest/no_previous_version.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/no_previous_version.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/LoadPeriodsStepTest/previous_version_deleted.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_deleted.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/LoadPeriodsStepTest/previous_version_deleted.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_deleted.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/LoadPeriodsStepTest/previous_version_is_last_one.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_is_last_one.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/LoadPeriodsStepTest/previous_version_is_last_one.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/previous_version_is_last_one.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/LoadPeriodsStepTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/shared.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/LoadPeriodsStepTest/shared.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/shared.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/LoadPeriodsStepTest/unprocessed_snapshots.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/unprocessed_snapshots.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/LoadPeriodsStepTest/unprocessed_snapshots.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest/unprocessed_snapshots.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistEventsStepTest/add_events-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/add_events-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistEventsStepTest/add_events-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/add_events-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistEventsStepTest/add_version_event-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/add_version_event-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistEventsStepTest/add_version_event-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/add_version_event-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistEventsStepTest/empty.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/empty.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistEventsStepTest/empty.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/empty.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistEventsStepTest/keep_one_event_by_version-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistEventsStepTest/keep_one_event_by_version-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistEventsStepTest/keep_one_event_by_version.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistEventsStepTest/keep_one_event_by_version.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistEventsStepTest/nothing_to_do_when_no_events_in_report.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/nothing_to_do_when_no_events_in_report.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistEventsStepTest/nothing_to_do_when_no_events_in_report.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/nothing_to_do_when_no_events_in_report.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistEventsStepTest/persist_report_events_with_component_children-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/persist_report_events_with_component_children-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistEventsStepTest/persist_report_events_with_component_children-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/persist_report_events_with_component_children-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/add_change-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/add_change-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/add_change-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/add_change-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/add_comment-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/add_comment-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/add_comment-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/add_comment-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/close_issue-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/close_issue-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/close_issue-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/close_issue-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/insert_new_issue.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/insert_new_issue.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/insert_new_issue.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/insert_new_issue.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/shared.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/shared.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest/shared.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistMeasuresStepTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest/shared.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistMeasuresStepTest/shared.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest/shared.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest/empty.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/empty.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest/empty.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/empty.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-index-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-index-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-index-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-index-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-report-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-report-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-report-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-report-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistProjectLinksStepTest/add_links_on_project_and_module-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/add_links_on_project_and_module-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistProjectLinksStepTest/add_links_on_project_and_module-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/add_links_on_project_and_module-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistProjectLinksStepTest/delete_link.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/delete_link.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistProjectLinksStepTest/delete_link.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/delete_link.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistProjectLinksStepTest/empty.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/empty.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistProjectLinksStepTest/empty.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/empty.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistProjectLinksStepTest/not_delete_custom_link.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/not_delete_custom_link.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistProjectLinksStepTest/not_delete_custom_link.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/not_delete_custom_link.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistProjectLinksStepTest/nothing_to_do_when_link_already_exists.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/nothing_to_do_when_link_already_exists.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistProjectLinksStepTest/nothing_to_do_when_link_already_exists.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/nothing_to_do_when_link_already_exists.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistProjectLinksStepTest/update_link-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/update_link-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistProjectLinksStepTest/update_link-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/update_link-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistProjectLinksStepTest/update_link.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/update_link.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistProjectLinksStepTest/update_link.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest/update_link.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/ReportExtractionStepTest/demozip.zip b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/ReportExtractionStepTest/demozip.zip similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/ReportExtractionStepTest/demozip.zip rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/ReportExtractionStepTest/demozip.zip diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/SwitchSnapshotStepTest/empty.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/empty.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/SwitchSnapshotStepTest/empty.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/empty.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/SwitchSnapshotStepTest/snapshots-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/SwitchSnapshotStepTest/snapshots-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/SwitchSnapshotStepTest/snapshots.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/step/SwitchSnapshotStepTest/snapshots.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots.xml -- 2.39.5