From 119cacc37ed66c5fcf08c7a3bf4197db79c58c39 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Thu, 21 Jun 2018 14:19:43 +0200 Subject: [PATCH] rename to package org.sonar.ce.task.projectanalysis from package org.sonar.server.computation.task.projectanalysis --- .../ProjectAnalysisTaskModule.java | 8 +- .../projectanalysis/analysis/Analysis.java | 2 +- .../analysis/AnalysisMetadataHolder.java | 6 +- .../analysis/AnalysisMetadataHolderImpl.java | 2 +- .../task/projectanalysis/analysis/Branch.java | 5 +- .../MutableAnalysisMetadataHolder.java | 2 +- .../analysis/Organization.java | 2 +- .../analysis/ProjectConfigurationFactory.java | 2 +- .../analysis/ScannerPlugin.java | 2 +- .../analysis}/package-info.java | 2 +- .../api/measurecomputer/ComponentImpl.java | 2 +- .../MeasureComputerContextImpl.java | 32 +- .../MeasureComputerDefinitionImpl.java | 2 +- .../MeasureComputerWrapper.java | 2 +- .../api/measurecomputer/MeasureImpl.java | 20 +- .../api/measurecomputer}/package-info.java | 2 +- .../api/posttask/BranchImpl.java | 2 +- .../api/posttask/CeTaskImpl.java | 2 +- .../api/posttask/ConditionImpl.java | 2 +- .../api/posttask/ConditionToCondition.java | 8 +- .../PostProjectAnalysisTasksExecutor.java | 24 +- .../api/posttask/ProjectImpl.java | 2 +- .../api/posttask/QualityGateImpl.java | 2 +- .../api/posttask/ScannerContextImpl.java | 2 +- .../api/posttask}/package-info.java | 2 +- .../batch/BatchReportDirectoryHolder.java | 2 +- .../batch/BatchReportDirectoryHolderImpl.java | 2 +- .../batch/BatchReportReader.java | 2 +- .../batch/BatchReportReaderImpl.java | 2 +- .../MutableBatchReportDirectoryHolder.java | 2 +- .../projectanalysis/batch}/package-info.java | 2 +- .../component/BranchLoader.java | 4 +- .../component/BranchLoaderDelegate.java | 2 +- .../component/BranchPersister.java | 2 +- .../component/BranchPersisterImpl.java | 6 +- .../projectanalysis/component/Component.java | 2 +- .../component/ComponentCrawler.java | 2 +- .../component/ComponentFunctions.java | 2 +- .../component/ComponentImpl.java | 2 +- .../component/ComponentKeyGenerator.java | 2 +- .../component/ComponentTreeBuilder.java | 4 +- .../component/ComponentUuidFactory.java | 2 +- .../component/ComponentVisitor.java | 2 +- .../component/ConfigurationRepository.java | 2 +- .../ConfigurationRepositoryImpl.java | 8 +- .../component/CrawlerDepthLimit.java | 2 +- .../component/DbIdsRepository.java | 2 +- .../component/DbIdsRepositoryImpl.java | 4 +- .../component/DefaultBranchImpl.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/MergeBranchComponentUuids.java | 4 +- .../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 +- .../ShortBranchComponentsWithIssues.java | 2 +- .../component/SubViewAttributes.java | 2 +- .../component/TreeRootHolder.java | 2 +- .../component/TreeRootHolderImpl.java | 4 +- .../component/TypeAwareVisitor.java | 2 +- .../component/TypeAwareVisitorAdapter.java | 2 +- .../component/TypeAwareVisitorWrapper.java | 2 +- .../component/ViewAttributes.java | 2 +- .../component/VisitException.java | 2 +- .../component/VisitorWrapper.java | 2 +- .../component/VisitorsCrawler.java | 2 +- .../component/package-info.java | 23 ++ .../container/ContainerFactory.java | 2 +- .../container/ContainerFactoryImpl.java | 2 +- ...ProjectAnalysisTaskContainerPopulator.java | 292 ++++++++++++++++++ .../container/package-info.java | 23 ++ .../dbmigration/DbMigrationModule.java | 2 +- .../PopulateFileSourceLineCount.java | 2 +- .../ProjectAnalysisDataChange.java | 4 +- .../ProjectAnalysisDataChanges.java | 2 +- .../ProjectAnalysisDataChangesImpl.java | 2 +- .../dbmigration/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/DuplicationMeasures.java | 28 +- .../duplication/DuplicationRepository.java | 5 +- .../DuplicationRepositoryImpl.java | 5 +- .../duplication/InProjectDuplicate.java | 5 +- .../duplication/InnerDuplicate.java | 2 +- .../IntegrateCrossProjectDuplications.java | 5 +- .../duplication/TextBlock.java | 2 +- .../duplication/package-info.java | 23 ++ .../task/projectanalysis/event/Event.java | 2 +- .../event/EventRepository.java | 9 +- .../event/EventRepositoryImpl.java | 5 +- .../projectanalysis/event/package-info.java | 23 ++ .../filemove/FileMoveDetectionStep.java | 25 +- .../filemove/FileSimilarity.java | 2 +- .../filemove/FileSimilarityImpl.java | 2 +- .../task/projectanalysis/filemove/Match.java | 2 +- .../filemove/MatchesByScore.java | 4 +- .../filemove/MovedFilesRepository.java | 5 +- .../filemove/MutableMovedFilesRepository.java | 9 +- .../MutableMovedFilesRepositoryImpl.java | 5 +- .../projectanalysis/filemove/ScoreMatrix.java | 2 +- .../filemove/ScoreMatrixDumper.java | 2 +- .../filemove/ScoreMatrixDumperImpl.java | 2 +- .../filemove/SourceSimilarity.java | 2 +- .../filemove/SourceSimilarityImpl.java | 2 +- .../filemove}/package-info.java | 3 +- .../ComputationTempFolderProvider.java | 2 +- .../filesystem/package-info.java | 23 ++ .../formula/AverageFormula.java | 4 +- .../task/projectanalysis/formula/Counter.java | 10 +- .../formula/CounterInitializationContext.java | 10 +- .../formula/CreateMeasureContext.java | 11 +- .../formula/DistributionFormula.java | 9 +- .../task/projectanalysis/formula/Formula.java | 4 +- .../FormulaExecutorComponentVisitor.java | 29 +- .../projectanalysis/formula/SumFormula.java | 12 +- .../formula/VariationSumFormula.java | 10 +- .../formula/counter/DoubleValue.java | 2 +- .../formula/counter/IntSumCounter.java | 7 +- .../formula/counter/IntValue.java | 2 +- .../formula/counter/LongSumCounter.java | 7 +- .../formula/counter/LongValue.java | 2 +- .../formula/counter/RatingValue.java | 2 +- .../formula/counter/SumCounter.java | 5 +- .../formula/counter/package-info.java | 23 ++ .../formula/coverage/CoverageFormula.java | 14 +- .../formula/coverage/CoverageUtils.java | 8 +- .../coverage/CoverageVariationFormula.java | 14 +- .../ElementsAndCoveredElementsCounter.java | 9 +- ...ntsAndCoveredElementsVariationCounter.java | 14 +- ...inesAndConditionsWithUncoveredCounter.java | 6 +- ...inesAndConditionsWithUncoveredFormula.java | 2 +- ...sAndConditionsWithUncoveredMetricKeys.java | 2 +- ...nditionsWithUncoveredVariationCounter.java | 7 +- ...nditionsWithUncoveredVariationFormula.java | 2 +- .../coverage/SingleWithUncoveredCounter.java | 6 +- .../coverage/SingleWithUncoveredFormula.java | 2 +- .../SingleWithUncoveredMetricKeys.java | 2 +- .../SingleWithUncoveredVariationCounter.java | 6 +- .../SingleWithUncoveredVariationFormula.java | 2 +- .../formula/coverage/package-info.java | 23 ++ .../projectanalysis/formula/package-info.java | 23 ++ .../issue/BaseIssuesLoader.java | 4 +- ...CloseIssuesOnRemovedComponentsVisitor.java | 10 +- .../issue/ComponentIssuesLoader.java | 4 +- .../issue/ComponentIssuesRepository.java | 5 +- .../issue/ComponentIssuesRepositoryImpl.java | 5 +- .../ComponentsWithUnprocessedIssues.java | 2 +- .../projectanalysis/issue/DebtCalculator.java | 2 +- .../issue/DefaultAssignee.java | 7 +- .../issue/DefaultTrackingInput.java | 2 +- .../issue/EffortAggregator.java | 13 +- .../issue/IntegrateIssuesVisitor.java | 14 +- .../projectanalysis/issue/IssueAssigner.java | 11 +- .../projectanalysis/issue/IssueCache.java | 2 +- .../projectanalysis/issue/IssueCounter.java | 17 +- .../issue/IssueCreationDateCalculator.java | 21 +- .../projectanalysis/issue/IssueLifecycle.java | 4 +- .../issue/IssueTrackingDelegator.java | 9 +- .../projectanalysis/issue/IssueVisitor.java | 5 +- .../projectanalysis/issue/IssueVisitors.java | 5 +- .../issue/IssuesRepositoryVisitor.java | 5 +- ...ComponentUuidsHavingOpenIssuesVisitor.java | 10 +- .../issue/MergeBranchTrackerExecution.java | 5 +- .../issue/MovedIssueVisitor.java | 11 +- .../MutableComponentIssuesRepository.java | 5 +- .../issue/NewEffortAggregator.java | 17 +- .../RemoveProcessedComponentsVisitor.java | 7 +- .../task/projectanalysis/issue/Rule.java | 2 +- .../task/projectanalysis/issue/RuleImpl.java | 2 +- .../projectanalysis/issue/RuleRepository.java | 2 +- .../issue/RuleRepositoryImpl.java | 4 +- .../projectanalysis/issue/RuleTagsCopier.java | 5 +- .../projectanalysis/issue/RuleTypeCopier.java | 5 +- .../issue/ScmAccountToUser.java | 2 +- .../issue/ScmAccountToUserLoader.java | 4 +- .../issue/ShortBranchIssue.java | 2 +- .../issue/ShortBranchIssueMerger.java | 5 +- .../issue/ShortBranchIssuesLoader.java | 8 +- .../issue/ShortBranchTrackerExecution.java | 5 +- .../issue/TrackerBaseInputFactory.java | 9 +- .../issue/TrackerExecution.java | 5 +- .../issue/TrackerMergeBranchInputFactory.java | 8 +- .../issue/TrackerRawInputFactory.java | 17 +- .../projectanalysis/issue/TrackingResult.java | 2 +- .../issue/UpdateConflictResolver.java | 2 +- .../commonrule/AbstractCoverageRule.java | 15 +- .../issue/commonrule/BranchCoverageRule.java | 8 +- .../issue/commonrule/CommentDensityRule.java | 17 +- .../issue/commonrule/CommonRule.java | 9 +- .../issue/commonrule/CommonRuleEngine.java | 5 +- .../commonrule/CommonRuleEngineImpl.java | 5 +- .../issue/commonrule/DuplicatedBlockRule.java | 17 +- .../issue/commonrule/LineCoverageRule.java | 8 +- .../issue/commonrule/SkippedTestRule.java | 17 +- .../issue/commonrule/TestErrorRule.java | 17 +- .../issue/commonrule/package-info.java | 23 ++ .../issue/filter/IssueFilter.java | 8 +- .../issue/filter/IssuePattern.java | 5 +- .../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/LiveMeasureDtoToMeasure.java | 6 +- .../measure/MapBasedRawMeasureRepository.java | 8 +- .../task/projectanalysis/measure/Measure.java | 5 +- .../measure/MeasureComputersHolder.java | 5 +- .../measure/MeasureComputersHolderImpl.java | 5 +- .../measure/MeasureComputersVisitor.java | 24 +- .../measure/MeasureDtoToMeasure.java | 6 +- .../projectanalysis/measure/MeasureKey.java | 5 +- .../measure/MeasureRepository.java | 11 +- .../measure/MeasureRepositoryImpl.java | 16 +- .../measure/MeasureToMeasureDto.java | 12 +- .../MutableMeasureComputersHolder.java | 5 +- .../measure/PostMeasuresComputationCheck.java | 4 +- .../PostMeasuresComputationChecksStep.java | 12 +- .../measure/QualityGateStatus.java | 2 +- .../projectanalysis/measure/package-info.java | 23 ++ .../EvaluatedCondition.java | 8 +- .../QualityGateDetailsData.java | 8 +- .../qualitygatedetails}/package-info.java | 2 +- .../task/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 ++ .../ce/task/projectanalysis/package-info.java | 23 ++ .../task/projectanalysis/period/Period.java | 2 +- .../projectanalysis/period/PeriodHolder.java | 2 +- .../period/PeriodHolderImpl.java | 2 +- .../projectanalysis/period/package-info.java | 23 ++ .../qualitygate/Condition.java | 5 +- .../qualitygate/ConditionEvaluator.java | 7 +- .../qualitygate/ConditionStatus.java | 2 +- .../qualitygate/EvaluationResult.java | 4 +- .../EvaluationResultTextConverter.java | 2 +- .../EvaluationResultTextConverterImpl.java | 14 +- .../qualitygate/MutableQualityGateHolder.java | 2 +- .../MutableQualityGateStatusHolder.java | 2 +- .../qualitygate/QualityGate.java | 2 +- .../qualitygate/QualityGateHolder.java | 2 +- .../qualitygate/QualityGateHolderImpl.java | 2 +- .../qualitygate/QualityGateService.java | 4 +- .../qualitygate/QualityGateServiceImpl.java | 7 +- .../qualitygate/QualityGateStatus.java | 2 +- .../qualitygate/QualityGateStatusHolder.java | 2 +- .../QualityGateStatusHolderImpl.java | 2 +- .../qualitygate/package-info.java | 23 ++ .../MaintainabilityMeasuresVisitor.java | 28 +- .../NewMaintainabilityMeasuresVisitor.java | 34 +- ...ilityAndSecurityRatingMeasuresVisitor.java | 27 +- .../qualitymodel/RatingSettings.java | 2 +- ...ilityAndSecurityRatingMeasuresVisitor.java | 29 +- .../qualitymodel/package-info.java | 23 ++ .../qualityprofile/ActiveRule.java | 2 +- .../qualityprofile/ActiveRulesHolder.java | 2 +- .../qualityprofile/ActiveRulesHolderImpl.java | 2 +- .../qualityprofile/package-info.java | 23 ++ .../task/projectanalysis/scm/Changeset.java | 2 +- .../task/projectanalysis/scm/DbScmInfo.java | 2 +- .../projectanalysis/scm/GeneratedScmInfo.java | 2 +- .../projectanalysis/scm/ReportScmInfo.java | 2 +- .../task/projectanalysis/scm/ScmInfo.java | 2 +- .../projectanalysis/scm/ScmInfoDbLoader.java | 12 +- .../task/projectanalysis/scm/ScmInfoImpl.java | 2 +- .../scm/ScmInfoRepository.java | 5 +- .../scm/ScmInfoRepositoryImpl.java | 22 +- .../projectanalysis/scm/package-info.java | 23 ++ .../source/ComputeFileSourceData.java | 6 +- .../source/DbLineHashVersion.java | 5 +- .../source/LastCommitVisitor.java | 24 +- .../source/ReportIterator.java | 2 +- .../source/SignificantCodeRepository.java | 7 +- .../source/SourceHashRepository.java | 5 +- .../source/SourceHashRepositoryImpl.java | 5 +- .../source/SourceLinesDiff.java | 5 +- .../source/SourceLinesDiffFinder.java | 2 +- .../source/SourceLinesDiffImpl.java | 5 +- .../source/SourceLinesHashCache.java | 5 +- .../source/SourceLinesHashRepository.java | 9 +- .../source/SourceLinesHashRepositoryImpl.java | 5 +- .../source/SourceLinesRepository.java | 6 +- .../source/SourceLinesRepositoryImpl.java | 8 +- .../source/linereader/CoverageLineReader.java | 2 +- .../linereader/DuplicationLineReader.java | 14 +- .../linereader/HighlightingLineReader.java | 10 +- .../source/linereader/LineReader.java | 2 +- .../linereader/RangeOffsetConverter.java | 2 +- .../source/linereader/ScmLineReader.java | 6 +- .../source/linereader/SymbolsLineReader.java | 8 +- .../source/linereader/package-info.java | 23 ++ .../projectanalysis/source/package-info.java | 23 ++ .../step/AbstractComputationSteps.java | 2 +- .../step/BuildComponentTreeStep.java | 28 +- .../step/CommentMeasuresStep.java | 39 ++- .../step/ComplexityMeasuresStep.java | 26 +- .../step/ComputeMeasureVariationsStep.java | 34 +- .../step/ComputeQProfileMeasureStep.java | 24 +- .../step/CoverageMeasuresStep.java | 30 +- .../step/CustomMeasuresCopyStep.java | 28 +- .../step/DbMigrationsStep.java | 8 +- .../step/DuplicationDataMeasuresStep.java | 39 ++- .../step/DuplicationMeasuresStep.java | 4 +- .../step/EnableAnalysisStep.java | 9 +- .../step/ExecuteVisitorsStep.java | 10 +- .../step/ExtractReportStep.java | 4 +- .../step/GenerateAnalysisUuid.java | 4 +- .../step/IndexAnalysisStep.java | 4 +- .../LanguageDistributionMeasuresStep.java | 33 +- ...rossProjectDuplicationsRepositoryStep.java | 31 +- .../step/LoadDuplicationsFromReportStep.java | 43 ++- .../step/LoadMeasureComputersStep.java | 10 +- .../projectanalysis/step/LoadPeriodsStep.java | 34 +- .../step/LoadQualityGateStep.java | 16 +- .../step/LoadQualityProfilesStep.java | 16 +- .../LoadReportAnalysisMetadataHolderStep.java | 13 +- .../step/NewCoverageMeasuresStep.java | 67 ++-- .../step/NewSizeMeasuresStep.java | 53 ++-- .../projectanalysis/step/PeriodResolver.java | 5 +- .../step/PersistAnalysisPropertiesStep.java | 6 +- .../step/PersistAnalysisStep.java | 23 +- .../step/PersistComponentsStep.java | 26 +- ...rsistCrossProjectDuplicationIndexStep.java | 22 +- .../step/PersistEventsStep.java | 21 +- .../step/PersistExternalRulesStep.java | 5 +- .../step/PersistFileSourcesStep.java | 46 +-- .../step/PersistIssuesStep.java | 11 +- .../step/PersistLiveMeasuresStep.java | 26 +- .../step/PersistMeasuresStep.java | 28 +- .../step/PersistProjectLinksStep.java | 11 +- .../step/PersistScannerContextStep.java | 4 +- .../step/PersistTestsStep.java | 20 +- .../step/PublishTaskResultStep.java | 4 +- .../step/PurgeDatastoresStep.java | 24 +- .../step/QualityGateEventsStep.java | 38 ++- .../step/QualityGateMeasuresStep.java | 56 ++-- .../step/QualityProfileEventsStep.java | 26 +- .../step/ReportComputationSteps.java | 6 +- .../step/SendIssueNotificationsStep.java | 22 +- .../step/SizeMeasuresStep.java | 30 +- .../SmallChangesetQualityGateSpecialCase.java | 17 +- .../step/TriggerViewRefreshStep.java | 6 +- .../step/UnitTestMeasuresStep.java | 35 ++- ...UpdateQualityProfilesLastUsedDateStep.java | 19 +- .../step/ValidateProjectStep.java | 22 +- .../step/VerifyBillingStep.java | 6 +- .../projectanalysis/step/package-info.java | 23 ++ .../taskprocessor/ReportTaskProcessor.java | 4 +- .../taskprocessor/package-info.java | 23 ++ .../view/TriggerViewRefreshDelegate.java | 2 +- .../projectanalysis/view/package-info.java | 23 ++ .../webhook/WebhookPostTask.java | 2 +- .../projectanalysis/webhook/package-info.java | 23 ++ .../api/measurecomputer/package-info.java | 23 -- .../api/posttask/package-info.java | 23 -- .../component/package-info.java | 23 -- ...ProjectAnalysisTaskContainerPopulator.java | 292 ------------------ .../container/package-info.java | 23 -- .../dbmigration/package-info.java | 23 -- .../duplication/package-info.java | 23 -- .../projectanalysis/event/package-info.java | 23 -- .../filemove/package-info.java | 24 -- .../filesystem/package-info.java | 23 -- .../formula/counter/package-info.java | 23 -- .../formula/coverage/package-info.java | 23 -- .../projectanalysis/formula/package-info.java | 23 -- .../issue/commonrule/package-info.java | 23 -- .../issue/filter/package-info.java | 23 -- .../projectanalysis/issue/package-info.java | 23 -- .../language/package-info.java | 23 -- .../projectanalysis/measure/package-info.java | 23 -- .../qualitygatedetails/package-info.java | 23 -- .../projectanalysis/metric/package-info.java | 23 -- .../projectanalysis/period/package-info.java | 23 -- .../qualitygate/package-info.java | 23 -- .../qualitymodel/package-info.java | 23 -- .../qualityprofile/package-info.java | 23 -- .../source/linereader/package-info.java | 23 -- .../projectanalysis/source/package-info.java | 23 -- .../taskprocessor/package-info.java | 23 -- .../projectanalysis/webhook/package-info.java | 23 -- .../analysis/AnalysisImplTest.java | 2 +- .../AnalysisMetadataHolderImplTest.java | 4 +- .../analysis/AnalysisMetadataHolderRule.java | 5 +- .../MutableAnalysisMetadataHolderRule.java | 2 +- .../analysis/OrganizationTest.java | 2 +- .../ProjectConfigurationFactoryTest.java | 4 +- .../analysis/ScannerPluginTest.java | 2 +- .../measurecomputer/ComponentImplTest.java | 2 +- .../MeasureComputerContextImplTest.java | 30 +- .../MeasureComputerDefinitionImplTest.java | 8 +- .../api/measurecomputer/MeasureImplTest.java | 4 +- .../api/posttask/CeTaskImplTest.java | 2 +- .../api/posttask/ConditionImplTest.java | 4 +- .../posttask/ConditionToConditionTest.java | 8 +- .../PostProjectAnalysisTasksExecutorTest.java | 36 +-- .../api/posttask/ProjectImplTest.java | 2 +- .../api/posttask/QualityGateImplTest.java | 2 +- .../BatchReportDirectoryHolderImplTest.java | 2 +- .../batch/BatchReportReaderImplTest.java | 2 +- .../batch/BatchReportReaderRule.java | 6 +- .../ImmutableBatchReportDirectoryHolder.java | 2 +- .../component/AbstractComponentProvider.java | 2 +- .../component/BranchLoaderTest.java | 6 +- .../component/BranchPersisterImplTest.java | 10 +- .../projectanalysis/component/CallRecord.java | 2 +- .../CallRecorderPathAwareVisitor.java | 6 +- .../CallRecorderTypeAwareVisitor.java | 2 +- .../component/ComponentFunctionsTest.java | 8 +- .../component/ComponentImplTest.java | 12 +- .../component/ComponentProvider.java | 2 +- .../component/ComponentTest.java | 16 +- .../component/ComponentTreeBuilderTest.java | 6 +- .../component/ComponentUuidFactoryTest.java | 2 +- .../ConfigurationRepositoryTest.java | 8 +- .../component/CrawlerDepthLimitTest.java | 8 +- .../component/DbIdsRepositoryImplTest.java | 4 +- .../component/DefaultBranchImplTest.java | 2 +- .../DisabledComponentsHolderImplTest.java | 2 +- .../component/DumbDeveloper.java | 2 +- .../component/FileAttributesTest.java | 2 +- .../MergeBranchComponentUuidsTest.java | 6 +- .../component/MutableDbIdsRepositoryRule.java | 3 +- .../component/MutableTreeRootHolderRule.java | 2 +- .../component/NoComponentProvider.java | 2 +- .../component/PathAwareCallRecord.java | 2 +- .../component/ReportComponent.java | 2 +- .../component/ReportPathAwareVisitorTest.java | 55 ++-- ...derDepthTraversalTypeAwareCrawlerTest.java | 108 +++---- ...derDepthTraversalTypeAwareCrawlerTest.java | 12 +- .../component/ReportVisitorsCrawlerTest.java | 14 +- ...sitorsCrawlerWithPathAwareVisitorTest.java | 55 ++-- ...wlerWithPostOrderTypeAwareVisitorTest.java | 12 +- ...awlerWithPreOrderTypeAwareVisitorTest.java | 12 +- .../ShortBranchComponentsWithIssuesTest.java | 2 +- .../component/TestSettingsRepository.java | 2 +- .../component/TreeComponentProvider.java | 2 +- .../TreeRootHolderComponentProvider.java | 2 +- .../component/TreeRootHolderImplTest.java | 25 +- .../component/TreeRootHolderRule.java | 2 +- .../TypeAwareVisitorAdapterTest.java | 4 +- .../component/ViewAttributesTest.java | 6 +- .../component/ViewsComponent.java | 4 +- .../component/ViewsPathAwareVisitorTest.java | 42 +-- ...derDepthTraversalTypeAwareCrawlerTest.java | 78 ++--- ...derDepthTraversalTypeAwareCrawlerTest.java | 78 ++--- .../component/ViewsVisitorsCrawlerTest.java | 12 +- ...sitorsCrawlerWithPathAwareVisitorTest.java | 47 ++- ...wlerWithPostOrderTypeAwareVisitorTest.java | 10 +- ...awlerWithPreOrderTypeAwareVisitorTest.java | 10 +- ...ectAnalysisTaskContainerPopulatorTest.java | 8 +- .../dbmigration/DbMigrationModuleTest.java | 5 +- .../PopulateFileSourceLineCountTest.java | 10 +- .../ProjectAnalysisDataChangesImplTest.java | 2 +- .../CrossProjectDuplicateTest.java | 2 +- ...rojectDuplicationStatusHolderImplTest.java | 6 +- .../duplication/DuplicateTest.java | 6 +- .../DuplicationRepositoryImplTest.java | 11 +- .../DuplicationRepositoryRule.java | 29 +- .../duplication/DuplicationTest.java | 6 +- .../duplication/InProjectDuplicateTest.java | 9 +- .../duplication/InnerDuplicateTest.java | 2 +- ...IntegrateCrossProjectDuplicationsTest.java | 10 +- .../ReportDuplicationMeasuresTest.java | 20 +- .../duplication/TextBlockTest.java | 2 +- .../ViewsDuplicationMeasuresTest.java | 18 +- .../event/EventRepositoryImplTest.java | 40 +-- .../task/projectanalysis/event/EventTest.java | 2 +- .../filemove/FileMoveDetectionStepTest.java | 28 +- .../projectanalysis/filemove/MatchTest.java | 2 +- .../filemove/MatchesByScoreTest.java | 6 +- .../MutableMovedFilesRepositoryImplTest.java | 8 +- .../MutableMovedFilesRepositoryRule.java | 4 +- .../filemove/ScoreMatrixDumperImplTest.java | 4 +- .../filemove/SourceSimilarityImplTest.java | 2 +- .../formula/AverageFormulaExecutionTest.java | 52 ++-- .../formula/AverageFormulaTest.java | 14 +- .../DistributionFormulaExecutionTest.java | 50 +-- .../formula/DistributionFormulaTest.java | 16 +- .../formula/DumbCreateMeasureContext.java | 10 +- .../formula/IntSumFormulaTest.java | 22 +- .../formula/LongSumFormulaTest.java | 20 +- ...rtFormulaExecutorComponentVisitorTest.java | 38 +-- .../formula/SumFormulaExecutionTest.java | 52 ++-- ...wsFormulaExecutorComponentVisitorTest.java | 36 +-- .../formula/counter/DoubleValueTest.java | 2 +- .../formula/counter/IntSumCounterTest.java | 6 +- .../formula/counter/IntValueTest.java | 2 +- .../formula/counter/LongSumCounterTest.java | 6 +- .../formula/counter/LongValueTest.java | 2 +- .../formula/counter/RatingValueTest.java | 2 +- .../formula/coverage/CoverageUtilsTest.java | 16 +- ...eIssuesOnRemovedComponentsVisitorTest.java | 15 +- .../ComponentIssuesRepositoryImplTest.java | 6 +- .../issue/ComponentIssuesRepositoryRule.java | 15 +- .../ComponentsWithUnprocessedIssuesTest.java | 2 +- .../issue/DebtCalculatorTest.java | 2 +- .../issue/DefaultAssigneeTest.java | 10 +- .../issue/DefaultTrackingInputTest.java | 7 +- .../task/projectanalysis/issue/DumbRule.java | 2 +- .../issue/EffortAggregatorTest.java | 10 +- .../issue/FillComponentIssuesVisitorRule.java | 12 +- .../issue/IntegrateIssuesVisitorTest.java | 41 +-- .../issue/IssueAssignerTest.java | 12 +- .../issue/IssueCounterTest.java | 26 +- .../IssueCreationDateCalculatorTest.java | 20 +- .../issue/IssueLifecycleTest.java | 10 +- .../issue/IssueTrackingDelegatorTest.java | 8 +- .../issue/IssuesRepositoryVisitorTest.java | 14 +- ...onentUuidsHavingOpenIssuesVisitorTest.java | 15 +- .../MergeBranchTrackerExecutionTest.java | 12 +- .../issue/MovedIssueVisitorTest.java | 10 +- .../issue/NewEffortAggregatorTest.java | 16 +- .../RemoveProcessedComponentsVisitorTest.java | 17 +- .../issue/RuleRepositoryImplTest.java | 4 +- .../issue/RuleRepositoryRule.java | 6 +- .../issue/RuleTagsCopierTest.java | 4 +- .../issue/RuleTypeCopierTest.java | 4 +- .../issue/ScmAccountToUserLoaderTest.java | 7 +- .../issue/ShortBranchIssueMergerTest.java | 14 +- .../ShortBranchTrackerExecutionTest.java | 13 +- .../issue/TrackerBaseInputFactoryTest.java | 8 +- .../issue/TrackerRawInputFactoryTest.java | 20 +- .../issue/UpdateConflictResolverTest.java | 6 +- .../commonrule/BranchCoverageRuleTest.java | 2 +- .../commonrule/CommentDensityRuleTest.java | 26 +- .../commonrule/CommonRuleEngineImplTest.java | 10 +- .../issue/commonrule/CommonRuleTest.java | 4 +- .../issue/commonrule/CoverageRuleTest.java | 23 +- .../commonrule/DuplicatedBlockRuleTest.java | 23 +- .../commonrule/LineCoverageRuleTest.java | 2 +- .../issue/commonrule/SkippedTestRuleTest.java | 23 +- .../issue/commonrule/TestErrorRuleTest.java | 22 +- .../issue/filter/IssueFilterTest.java | 12 +- .../issue/filter/IssuePatternTest.java | 2 +- .../language/LanguageRepositoryImplTest.java | 2 +- .../measure/BatchMeasureToMeasureTest.java | 10 +- .../measure/BestValueOptimizationTest.java | 12 +- .../measure/LiveMeasureDtoToMeasureTest.java | 8 +- .../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 | 4 +- .../measure/MeasureRepoEntry.java | 4 +- .../measure/MeasureRepositoryImplTest.java | 18 +- .../measure/MeasureRepositoryRule.java | 25 +- .../projectanalysis/measure/MeasureTest.java | 10 +- .../measure/MeasureToMeasureDtoTest.java | 14 +- ...PostMeasuresComputationChecksStepTest.java | 14 +- .../measure/QualityGateStatusTest.java | 2 +- .../ReportMeasureComputersVisitorTest.java | 46 ++- .../ViewsMeasureComputersVisitorTest.java | 31 +- .../EvaluatedConditionTest.java | 8 +- .../QualityGateDetailsDataTest.java | 10 +- .../metric/MetricDtoToMetricTest.java | 14 +- .../metric/MetricImplTest.java | 2 +- .../metric/MetricRepositoryImplTest.java | 3 +- .../metric/MetricRepositoryRule.java | 2 +- .../metric/ReportMetricValidatorImplTest.java | 3 +- .../period/PeriodHolderImplTest.java | 2 +- .../period/PeriodHolderRule.java | 2 +- .../projectanalysis/period/PeriodTest.java | 2 +- .../qualitygate/ConditionEvaluatorTest.java | 46 +-- .../qualitygate/ConditionStatusTest.java | 8 +- .../qualitygate/ConditionTest.java | 4 +- .../qualitygate/EvaluationResultAssert.java | 4 +- .../qualitygate/EvaluationResultTest.java | 6 +- .../EvaluationResultTextConverterTest.java | 16 +- .../MutableQualityGateHolderRule.java | 2 +- .../MutableQualityGateStatusHolderRule.java | 2 +- .../QualityGateHolderImplTest.java | 2 +- .../qualitygate/QualityGateHolderRule.java | 2 +- .../QualityGateServiceImplTest.java | 10 +- .../QualityGateStatusHolderImplTest.java | 2 +- .../MaintainabilityMeasuresVisitorTest.java | 36 +-- ...NewMaintainabilityMeasuresVisitorTest.java | 38 +-- ...yAndSecurityRatingMeasuresVisitorTest.java | 37 ++- .../qualitymodel/RatingSettingsTest.java | 2 +- ...yAndSecurityRatingMeasuresVisitorTest.java | 39 ++- .../ActiveRulesHolderImplTest.java | 2 +- .../qualityprofile/ActiveRulesHolderRule.java | 2 +- .../AlwaysActiveRulesHolderImpl.java | 2 +- .../projectanalysis/scm/ChangesetTest.java | 2 +- .../projectanalysis/scm/DbScmInfoTest.java | 2 +- .../scm/ReportScmInfoTest.java | 2 +- .../scm/ScmInfoDbLoaderTest.java | 22 +- .../projectanalysis/scm/ScmInfoImplTest.java | 2 +- .../scm/ScmInfoRepositoryImplTest.java | 26 +- .../scm/ScmInfoRepositoryRule.java | 8 +- .../source/ComputeFileSourceDataTest.java | 6 +- .../source/DbLineHashVersionTest.java | 6 +- .../source/LastCommitVisitorTest.java | 42 +-- .../source/RangeOffsetConverterTest.java | 18 +- .../source/ReportIteratorTest.java | 2 +- .../source/SignificantCodeRepositoryTest.java | 10 +- .../source/SourceHashRepositoryImplTest.java | 62 ++-- .../source/SourceLinesDiffFinderTest.java | 2 +- .../source/SourceLinesDiffImplTest.java | 10 +- .../source/SourceLinesHashCacheTest.java | 8 +- .../source/SourceLinesHashImplTest.java | 6 +- .../SourceLinesHashRepositoryImplTest.java | 14 +- .../source/SourceLinesRepositoryImplTest.java | 10 +- .../source/SourceLinesRepositoryRule.java | 7 +- .../linereader/CoverageLineReaderTest.java | 3 +- .../linereader/DuplicationLineReaderTest.java | 71 ++--- .../HighlightingLineReaderTest.java | 10 +- .../source/linereader/ScmLineReaderTest.java | 9 +- .../linereader/SymbolsLineReaderTest.java | 32 +- .../projectanalysis/step/BaseStepTest.java | 2 +- .../step/BuildComponentTreeStepTest.java | 14 +- .../step/ComputeQProfileMeasureStepTest.java | 24 +- .../step/CustomMeasuresCopyStepTest.java | 44 +-- .../step/DbMigrationsStepTest.java | 9 +- .../step/DuplicationDataMeasuresStepTest.java | 41 ++- .../step/DuplicationMeasuresStepTest.java | 6 +- .../step/EnableAnalysisStepTest.java | 12 +- .../step/ExecuteVisitorsStepTest.java | 34 +- .../step/ExtractReportStepTest.java | 6 +- .../step/IndexAnalysisStepTest.java | 16 +- ...ProjectDuplicationsRepositoryStepTest.java | 24 +- .../LoadDuplicationsFromReportStepTest.java | 30 +- .../step/LoadMeasureComputersStepTest.java | 11 +- .../step/LoadPeriodsStepTest.java | 16 +- .../step/LoadQualityGateStepTest.java | 12 +- .../step/LoadQualityProfilesStepTest.java | 12 +- ...dReportAnalysisMetadataHolderStepTest.java | 18 +- .../step/NewSizeMeasuresStepTest.java | 32 +- .../PersistAnalysisPropertiesStepTest.java | 6 +- .../step/PersistComponentsStepTest.java | 14 +- ...tCrossProjectDuplicationIndexStepTest.java | 19 +- .../step/PersistEventsStepTest.java | 24 +- .../step/PersistExternalRulesStepTest.java | 8 +- .../step/PersistFileSourcesStepTest.java | 36 +-- .../step/PersistIssuesStepTest.java | 12 +- .../step/PersistLiveMeasuresStepTest.java | 41 +-- .../step/PersistMeasuresStepTest.java | 34 +- .../step/PersistProjectLinksStepTest.java | 18 +- .../step/PersistScannerContextStepTest.java | 6 +- .../step/PersistTestsStepTest.java | 12 +- .../step/PublishTaskResultStepTest.java | 4 +- .../step/PurgeDatastoresStepTest.java | 16 +- .../step/QualityGateEventsStepTest.java | 38 +-- .../step/QualityGateMeasuresStepTest.java | 50 +-- .../step/QualityProfileEventsStepTest.java | 31 +- .../step/ReportCommentMeasuresStepTest.java | 30 +- .../ReportComplexityMeasuresStepTest.java | 26 +- .../step/ReportComputationStepsTest.java | 4 +- ...eportComputeMeasureVariationsStepTest.java | 28 +- .../step/ReportCoverageMeasuresStepTest.java | 30 +- ...tLanguageDistributionMeasuresStepTest.java | 22 +- .../ReportNewCoverageMeasuresStepTest.java | 44 +-- .../step/ReportPersistAnalysisStepTest.java | 16 +- .../step/ReportPersistComponentsStepTest.java | 32 +- .../step/ReportSizeMeasuresStepTest.java | 37 ++- .../step/ReportUnitTestMeasuresStepTest.java | 26 +- .../step/SendIssueNotificationsStepTest.java | 39 +-- ...llChangesetQualityGateSpecialCaseTest.java | 28 +- .../step/TriggerViewRefreshStepTest.java | 7 +- ...teQualityProfilesLastUsedDateStepTest.java | 21 +- .../step/ValidateProjectStepTest.java | 16 +- .../step/VerifyBillingStepTest.java | 6 +- .../step/ViewsCommentMeasuresStepTest.java | 30 +- .../step/ViewsComplexityMeasuresStepTest.java | 24 +- ...ViewsComputeMeasureVariationsStepTest.java | 24 +- .../step/ViewsCoverageMeasuresStepTest.java | 26 +- ...sLanguageDistributionMeasuresStepTest.java | 18 +- .../ViewsNewCoverageMeasuresStepTest.java | 32 +- .../step/ViewsPersistAnalysisStepTest.java | 20 +- .../step/ViewsPersistComponentsStepTest.java | 38 ++- .../step/ViewsSizeMeasuresStepTest.java | 24 +- .../step/ViewsUnitTestMeasuresStepTest.java | 22 +- .../webhook/WebhookPostTaskTest.java | 4 +- .../file_sources.sql | 0 ...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 | 2 +- ...omponentUuidColumnToDuplicationsIndex.java | 2 +- ...DuplicationsIndexRowsWithoutComponent.java | 2 +- ...mponentUuidNotNullOnDuplicationsIndex.java | 2 +- ...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 | 2 +- ...nalysisUuidNotNullOnDuplicationsIndex.java | 2 +- .../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 ...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 .../step/PersistMeasuresStepTest/shared.xml | 0 .../empty.xml | 0 .../insert-from-index-result.xml | 0 .../insert-from-report-result.xml | 0 .../step/ReportExtractionStepTest/demozip.zip | Bin .../step/SwitchSnapshotStepTest/empty.xml | 0 .../snapshots-result.xml | 0 .../step/SwitchSnapshotStepTest/snapshots.xml | 0 .../container/ComputeEngineContainerImpl.java | 4 +- .../sonar/ce/queue/InternalCeQueueImpl.java | 3 +- .../ce/taskprocessor/CeWorkerImplTest.java | 2 +- 748 files changed, 4585 insertions(+), 4405 deletions(-) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/ProjectAnalysisTaskModule.java (78%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/analysis/Analysis.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/analysis/AnalysisMetadataHolder.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/analysis/AnalysisMetadataHolderImpl.java (99%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/analysis/Branch.java (89%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/analysis/MutableAnalysisMetadataHolder.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/analysis/Organization.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/analysis/ProjectConfigurationFactory.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/analysis/ScannerPlugin.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation/task/projectanalysis => ce/task/projectanalysis/analysis}/package-info.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/measurecomputer/ComponentImpl.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java (79%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImpl.java (98%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/measurecomputer/MeasureComputerWrapper.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/measurecomputer/MeasureImpl.java (69%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation/task/projectanalysis/scm => ce/task/projectanalysis/api/measurecomputer}/package-info.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/posttask/BranchImpl.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/posttask/CeTaskImpl.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/posttask/ConditionImpl.java (98%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/posttask/ConditionToCondition.java (91%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java (90%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/posttask/ProjectImpl.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/posttask/QualityGateImpl.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/posttask/ScannerContextImpl.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation/task/projectanalysis/step => ce/task/projectanalysis/api/posttask}/package-info.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/batch/BatchReportDirectoryHolder.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/batch/BatchReportDirectoryHolderImpl.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/batch/BatchReportReader.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/batch/BatchReportReaderImpl.java (99%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/batch/MutableBatchReportDirectoryHolder.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation/task/projectanalysis/view => ce/task/projectanalysis/batch}/package-info.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/BranchLoader.java (92%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/BranchLoaderDelegate.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/BranchPersister.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/BranchPersisterImpl.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/Component.java (98%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ComponentCrawler.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ComponentFunctions.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ComponentImpl.java (99%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ComponentKeyGenerator.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ComponentTreeBuilder.java (98%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ComponentUuidFactory.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ComponentVisitor.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ConfigurationRepository.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ConfigurationRepositoryImpl.java (81%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/CrawlerDepthLimit.java (98%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/DbIdsRepository.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/DbIdsRepositoryImpl.java (90%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/DefaultBranchImpl.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/DepthTraversalTypeAwareCrawler.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/DequeBasedPath.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/Developer.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/DisabledComponentsHolder.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/DisabledComponentsHolderImpl.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/FileAttributes.java (90%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/MapBasedDbIdsRepository.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/MergeBranchComponentUuids.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/MutableDbIdsRepository.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/MutableDisabledComponentsHolder.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/MutableTreeRootHolder.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/PathAwareCrawler.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/PathAwareVisitor.java (98%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/PathAwareVisitorAdapter.java (98%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/PathAwareVisitorWrapper.java (98%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/PathElementImpl.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ProjectViewAttributes.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ReportAttributes.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ShortBranchComponentsWithIssues.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/SubViewAttributes.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/TreeRootHolder.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/TreeRootHolderImpl.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/TypeAwareVisitor.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/TypeAwareVisitorAdapter.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/TypeAwareVisitorWrapper.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ViewAttributes.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/VisitException.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/VisitorWrapper.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/VisitorsCrawler.java (99%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/container/ContainerFactory.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/container/ContainerFactoryImpl.java (95%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/dbmigration/DbMigrationModule.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/dbmigration/PopulateFileSourceLineCount.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/dbmigration/ProjectAnalysisDataChange.java (87%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/dbmigration/ProjectAnalysisDataChanges.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImpl.java (97%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/AbstractDuplicate.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/CrossProjectDuplicate.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolder.java (89%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImpl.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/DetailedTextBlock.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/Duplicate.java (92%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/Duplication.java (98%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/DuplicationMeasures.java (89%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/DuplicationRepository.java (91%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/DuplicationRepositoryImpl.java (92%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/InProjectDuplicate.java (91%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/InnerDuplicate.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/IntegrateCrossProjectDuplications.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/TextBlock.java (97%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/event/Event.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/event/EventRepository.java (80%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/event/EventRepositoryImpl.java (90%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/event/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStep.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileSimilarity.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileSimilarityImpl.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/Match.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/MatchesByScore.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/MovedFilesRepository.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/MutableMovedFilesRepository.java (81%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/MutableMovedFilesRepositoryImpl.java (92%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/ScoreMatrix.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/ScoreMatrixDumper.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/ScoreMatrixDumperImpl.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/SourceSimilarity.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/SourceSimilarityImpl.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation/task/projectanalysis/batch => ce/task/projectanalysis/filemove}/package-info.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/filesystem/ComputationTempFolderProvider.java (97%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filesystem/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/AverageFormula.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/Counter.java (77%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/CounterInitializationContext.java (81%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/CreateMeasureContext.java (77%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/DistributionFormula.java (90%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/Formula.java (91%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/FormulaExecutorComponentVisitor.java (87%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/SumFormula.java (88%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/VariationSumFormula.java (86%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/counter/DoubleValue.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/counter/IntSumCounter.java (89%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/counter/IntValue.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/counter/LongSumCounter.java (89%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/counter/LongValue.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/counter/RatingValue.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/counter/SumCounter.java (85%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/coverage/CoverageFormula.java (72%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/coverage/CoverageUtils.java (84%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/coverage/CoverageVariationFormula.java (72%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsCounter.java (84%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsVariationCounter.java (74%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredCounter.java (84%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredFormula.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredMetricKeys.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java (88%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationFormula.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/coverage/SingleWithUncoveredCounter.java (83%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/coverage/SingleWithUncoveredFormula.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/coverage/SingleWithUncoveredMetricKeys.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationCounter.java (84%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationFormula.java (95%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/package-info.java create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/BaseIssuesLoader.java (91%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitor.java (85%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/ComponentIssuesLoader.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/ComponentIssuesRepository.java (90%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/ComponentIssuesRepositoryImpl.java (91%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/ComponentsWithUnprocessedIssues.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/DebtCalculator.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/DefaultAssignee.java (91%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/DefaultTrackingInput.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/EffortAggregator.java (91%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/IntegrateIssuesVisitor.java (89%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/IssueAssigner.java (91%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/IssueCache.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/IssueCounter.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/IssueCreationDateCalculator.java (90%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/IssueLifecycle.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/IssueTrackingDelegator.java (90%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/IssueVisitor.java (90%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/IssueVisitors.java (89%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/IssuesRepositoryVisitor.java (91%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitor.java (79%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/MergeBranchTrackerExecution.java (90%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/MovedIssueVisitor.java (87%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/MutableComponentIssuesRepository.java (87%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/NewEffortAggregator.java (89%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/RemoveProcessedComponentsVisitor.java (87%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/Rule.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/RuleImpl.java (98%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/RuleRepository.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/RuleRepositoryImpl.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/RuleTagsCopier.java (89%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/RuleTypeCopier.java (89%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/ScmAccountToUser.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/ScmAccountToUserLoader.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/ShortBranchIssue.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/ShortBranchIssueMerger.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/ShortBranchIssuesLoader.java (91%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/ShortBranchTrackerExecution.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/TrackerBaseInputFactory.java (90%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/TrackerExecution.java (90%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/TrackerMergeBranchInputFactory.java (90%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/TrackerRawInputFactory.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/TrackingResult.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/UpdateConflictResolver.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/commonrule/AbstractCoverageRule.java (84%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/commonrule/BranchCoverageRule.java (84%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/commonrule/CommentDensityRule.java (86%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/commonrule/CommonRule.java (90%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/commonrule/CommonRuleEngine.java (85%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/commonrule/CommonRuleEngineImpl.java (91%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/commonrule/DuplicatedBlockRule.java (76%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/commonrule/LineCoverageRule.java (84%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/commonrule/SkippedTestRule.java (75%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/commonrule/TestErrorRule.java (78%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/filter/IssueFilter.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/filter/IssuePattern.java (91%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/filter/package-info.java create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/language/LanguageRepository.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/language/LanguageRepositoryImpl.java (96%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/language/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/BatchMeasureToMeasure.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/BestValueOptimization.java (90%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/LiveMeasureDtoToMeasure.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MapBasedRawMeasureRepository.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/Measure.java (98%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureComputersHolder.java (83%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureComputersHolderImpl.java (89%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureComputersVisitor.java (69%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureDtoToMeasure.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureKey.java (92%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureRepository.java (89%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureRepositoryImpl.java (87%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureToMeasureDto.java (89%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MutableMeasureComputersHolder.java (85%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/PostMeasuresComputationCheck.java (92%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/PostMeasuresComputationChecksStep.java (88%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/QualityGateStatus.java (97%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/qualitygatedetails/EvaluatedCondition.java (83%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsData.java (90%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation/task/projectanalysis/analysis => ce/task/projectanalysis/measure/qualitygatedetails}/package-info.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/metric/Metric.java (90%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/metric/MetricDtoToMetric.java (92%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/metric/MetricImpl.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/metric/MetricModule.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/metric/MetricRepository.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/metric/MetricRepositoryImpl.java (98%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/metric/ReportMetricValidator.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/metric/ReportMetricValidatorImpl.java (97%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/package-info.java create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/period/Period.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/period/PeriodHolder.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/period/PeriodHolderImpl.java (96%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/period/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/Condition.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/ConditionEvaluator.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/ConditionStatus.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/EvaluationResult.java (91%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/EvaluationResultTextConverter.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/EvaluationResultTextConverterImpl.java (88%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/MutableQualityGateHolder.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/MutableQualityGateStatusHolder.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/QualityGate.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/QualityGateHolder.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/QualityGateHolderImpl.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/QualityGateService.java (89%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/QualityGateServiceImpl.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/QualityGateStatus.java (92%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/QualityGateStatusHolder.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/QualityGateStatusHolderImpl.java (96%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitor.java (87%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitor.java (86%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitor.java (85%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitymodel/RatingSettings.java (98%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitor.java (80%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitymodel/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualityprofile/ActiveRule.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualityprofile/ActiveRulesHolder.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualityprofile/ActiveRulesHolderImpl.java (96%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualityprofile/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/scm/Changeset.java (98%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/scm/DbScmInfo.java (98%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/scm/GeneratedScmInfo.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/scm/ReportScmInfo.java (98%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/scm/ScmInfo.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/scm/ScmInfoDbLoader.java (85%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/scm/ScmInfoImpl.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/scm/ScmInfoRepository.java (90%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/scm/ScmInfoRepositoryImpl.java (87%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/ComputeFileSourceData.java (92%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/DbLineHashVersion.java (91%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/LastCommitVisitor.java (82%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/ReportIterator.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SignificantCodeRepository.java (90%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SourceHashRepository.java (89%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SourceHashRepositoryImpl.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SourceLinesDiff.java (88%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SourceLinesDiffFinder.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SourceLinesDiffImpl.java (92%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SourceLinesHashCache.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SourceLinesHashRepository.java (85%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SourceLinesHashRepositoryImpl.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SourceLinesRepository.java (85%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SourceLinesRepositoryImpl.java (91%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/linereader/CoverageLineReader.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/linereader/DuplicationLineReader.java (88%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/linereader/HighlightingLineReader.java (91%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/linereader/LineReader.java (92%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/linereader/RangeOffsetConverter.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/linereader/ScmLineReader.java (92%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/linereader/SymbolsLineReader.java (93%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/package-info.java create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/AbstractComputationSteps.java (96%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/BuildComponentTreeStep.java (79%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/CommentMeasuresStep.java (83%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ComplexityMeasuresStep.java (77%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ComputeMeasureVariationsStep.java (85%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ComputeQProfileMeasureStep.java (81%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/CoverageMeasuresStep.java (72%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/CustomMeasuresCopyStep.java (78%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/DbMigrationsStep.java (81%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/DuplicationDataMeasuresStep.java (75%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/DuplicationMeasuresStep.java (91%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/EnableAnalysisStep.java (86%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ExecuteVisitorsStep.java (85%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ExtractReportStep.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/GenerateAnalysisUuid.java (90%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/IndexAnalysisStep.java (92%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/LanguageDistributionMeasuresStep.java (79%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStep.java (83%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/LoadDuplicationsFromReportStep.java (67%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/LoadMeasureComputersStep.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/LoadPeriodsStep.java (70%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/LoadQualityGateStep.java (84%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/LoadQualityProfilesStep.java (82%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java (95%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/NewCoverageMeasuresStep.java (83%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/NewSizeMeasuresStep.java (81%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PeriodResolver.java (97%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistAnalysisPropertiesStep.java (92%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistAnalysisStep.java (81%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistComponentsStep.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java (81%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistEventsStep.java (86%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistExternalRulesStep.java (89%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistFileSourcesStep.java (81%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistIssuesStep.java (89%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistLiveMeasuresStep.java (82%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistMeasuresStep.java (81%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistProjectLinksStep.java (92%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistScannerContextStep.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistTestsStep.java (92%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PublishTaskResultStep.java (93%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PurgeDatastoresStep.java (72%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/QualityGateEventsStep.java (80%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/QualityGateMeasuresStep.java (81%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/QualityProfileEventsStep.java (85%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ReportComputationSteps.java (94%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/SendIssueNotificationsStep.java (91%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/SizeMeasuresStep.java (84%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/SmallChangesetQualityGateSpecialCase.java (81%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/TriggerViewRefreshStep.java (89%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/UnitTestMeasuresStep.java (83%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStep.java (85%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ValidateProjectStep.java (89%) rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/VerifyBillingStep.java (89%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/taskprocessor/ReportTaskProcessor.java (94%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/taskprocessor/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/view/TriggerViewRefreshDelegate.java (93%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/view/package-info.java rename server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/{server/computation => ce}/task/projectanalysis/webhook/WebhookPostTask.java (98%) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/webhook/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/container/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/event/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/language/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/period/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/package-info.java delete mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/package-info.java rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/analysis/AnalysisImplTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/analysis/AnalysisMetadataHolderImplTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/analysis/AnalysisMetadataHolderRule.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/analysis/MutableAnalysisMetadataHolderRule.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/analysis/OrganizationTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/analysis/ProjectConfigurationFactoryTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/analysis/ScannerPluginTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/measurecomputer/ComponentImplTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java (89%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/measurecomputer/MeasureImplTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/posttask/CeTaskImplTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/posttask/ConditionImplTest.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/posttask/ConditionToConditionTest.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java (90%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/posttask/ProjectImplTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/api/posttask/QualityGateImplTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/batch/BatchReportDirectoryHolderImplTest.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/batch/BatchReportReaderImplTest.java (99%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/batch/BatchReportReaderRule.java (99%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/batch/ImmutableBatchReportDirectoryHolder.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/AbstractComponentProvider.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/BranchLoaderTest.java (93%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/BranchPersisterImplTest.java (91%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/CallRecord.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/CallRecorderPathAwareVisitor.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/CallRecorderTypeAwareVisitor.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ComponentFunctionsTest.java (79%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ComponentImplTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ComponentProvider.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ComponentTest.java (82%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ComponentTreeBuilderTest.java (99%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ComponentUuidFactoryTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ConfigurationRepositoryTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/CrawlerDepthLimitTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/DbIdsRepositoryImplTest.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/DefaultBranchImplTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/DisabledComponentsHolderImplTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/DumbDeveloper.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/FileAttributesTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/MergeBranchComponentUuidsTest.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/MutableDbIdsRepositoryRule.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/MutableTreeRootHolderRule.java (93%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/NoComponentProvider.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/PathAwareCallRecord.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ReportComponent.java (99%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ReportPathAwareVisitorTest.java (87%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java (71%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ReportVisitorsCrawlerTest.java (91%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ReportVisitorsCrawlerWithPathAwareVisitorTest.java (88%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ShortBranchComponentsWithIssuesTest.java (99%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/TestSettingsRepository.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/TreeComponentProvider.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/TreeRootHolderComponentProvider.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/TreeRootHolderImplTest.java (83%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/TreeRootHolderRule.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/TypeAwareVisitorAdapterTest.java (85%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ViewAttributesTest.java (88%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ViewsComponent.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ViewsPathAwareVisitorTest.java (88%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ViewsPostOrderDepthTraversalTypeAwareCrawlerTest.java (70%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ViewsPreOrderDepthTraversalTypeAwareCrawlerTest.java (71%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ViewsVisitorsCrawlerWithPathAwareVisitorTest.java (90%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/component/ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/dbmigration/DbMigrationModuleTest.java (90%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/dbmigration/PopulateFileSourceLineCountTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImplTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/CrossProjectDuplicateTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/DuplicateTest.java (87%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/DuplicationRepositoryImplTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/DuplicationRepositoryRule.java (87%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/DuplicationTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/InProjectDuplicateTest.java (90%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/InnerDuplicateTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/IntegrateCrossProjectDuplicationsTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/ReportDuplicationMeasuresTest.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/TextBlockTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/duplication/ViewsDuplicationMeasuresTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/event/EventRepositoryImplTest.java (75%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/event/EventTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStepTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/MatchTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/MatchesByScoreTest.java (91%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/MutableMovedFilesRepositoryImplTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/MutableMovedFilesRepositoryRule.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/ScoreMatrixDumperImplTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/SourceSimilarityImplTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/AverageFormulaExecutionTest.java (75%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/AverageFormulaTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/DistributionFormulaExecutionTest.java (73%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/DistributionFormulaTest.java (86%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/DumbCreateMeasureContext.java (80%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/IntSumFormulaTest.java (88%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/LongSumFormulaTest.java (89%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java (91%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/SumFormulaExecutionTest.java (70%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java (89%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/counter/DoubleValueTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/counter/IntSumCounterTest.java (91%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/counter/IntValueTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/counter/LongSumCounterTest.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/counter/LongValueTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/counter/RatingValueTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/formula/coverage/CoverageUtilsTest.java (87%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitorTest.java (85%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/ComponentIssuesRepositoryImplTest.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/ComponentIssuesRepositoryRule.java (82%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/ComponentsWithUnprocessedIssuesTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/DebtCalculatorTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/DefaultAssigneeTest.java (90%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/DefaultTrackingInputTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/DumbRule.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/EffortAggregatorTest.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/FillComponentIssuesVisitorRule.java (85%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java (88%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/IssueAssignerTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/IssueCounterTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/IssueCreationDateCalculatorTest.java (93%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/IssueLifecycleTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/IssueTrackingDelegatorTest.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/IssuesRepositoryVisitorTest.java (90%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java (76%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/MergeBranchTrackerExecutionTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/MovedIssueVisitorTest.java (93%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/NewEffortAggregatorTest.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/RemoveProcessedComponentsVisitorTest.java (88%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/RuleRepositoryImplTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/RuleRepositoryRule.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/RuleTagsCopierTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/RuleTypeCopierTest.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java (93%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/ShortBranchIssueMergerTest.java (93%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/ShortBranchTrackerExecutionTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/TrackerBaseInputFactoryTest.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/TrackerRawInputFactoryTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/UpdateConflictResolverTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/commonrule/BranchCoverageRuleTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/commonrule/CommentDensityRuleTest.java (86%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/commonrule/CommonRuleEngineImplTest.java (85%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/commonrule/CommonRuleTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/commonrule/CoverageRuleTest.java (82%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/commonrule/DuplicatedBlockRuleTest.java (76%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/commonrule/LineCoverageRuleTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/commonrule/SkippedTestRuleTest.java (77%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/commonrule/TestErrorRuleTest.java (80%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/filter/IssueFilterTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/issue/filter/IssuePatternTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/language/LanguageRepositoryImplTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/BatchMeasureToMeasureTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/BestValueOptimizationTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/LiveMeasureDtoToMeasureTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java (93%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureAssert.java (99%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureComputersHolderImplTest.java (93%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureComputersHolderRule.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureDtoToMeasureTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureKeyTest.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureLevelTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureRepoEntry.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureRepositoryImplTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureRepositoryRule.java (93%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureToMeasureDtoTest.java (93%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/PostMeasuresComputationChecksStepTest.java (89%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/QualityGateStatusTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java (79%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java (86%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/qualitygatedetails/EvaluatedConditionTest.java (89%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java (90%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/metric/MetricDtoToMetricTest.java (88%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/metric/MetricImplTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/metric/MetricRepositoryImplTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/metric/MetricRepositoryRule.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/metric/ReportMetricValidatorImplTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/period/PeriodHolderImplTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/period/PeriodHolderRule.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/period/PeriodTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java (85%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/ConditionStatusTest.java (89%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/ConditionTest.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/EvaluationResultAssert.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/EvaluationResultTest.java (88%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/EvaluationResultTextConverterTest.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/MutableQualityGateHolderRule.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/MutableQualityGateStatusHolderRule.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/QualityGateHolderImplTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/QualityGateHolderRule.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/QualityGateServiceImplTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitygate/QualityGateStatusHolderImplTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitorTest.java (90%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitorTest.java (93%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitorTest.java (90%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitymodel/RatingSettingsTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitorTest.java (85%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualityprofile/ActiveRulesHolderImplTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualityprofile/ActiveRulesHolderRule.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/qualityprofile/AlwaysActiveRulesHolderImpl.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/scm/ChangesetTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/scm/DbScmInfoTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/scm/ReportScmInfoTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/scm/ScmInfoDbLoaderTest.java (90%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/scm/ScmInfoImplTest.java (98%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java (91%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/scm/ScmInfoRepositoryRule.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/ComputeFileSourceDataTest.java (93%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/DbLineHashVersionTest.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/LastCommitVisitorTest.java (80%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/RangeOffsetConverterTest.java (88%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/ReportIteratorTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SignificantCodeRepositoryTest.java (90%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SourceHashRepositoryImplTest.java (77%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SourceLinesDiffFinderTest.java (99%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SourceLinesDiffImplTest.java (88%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SourceLinesHashCacheTest.java (91%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SourceLinesHashImplTest.java (88%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SourceLinesHashRepositoryImplTest.java (93%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SourceLinesRepositoryImplTest.java (91%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/SourceLinesRepositoryRule.java (88%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/linereader/CoverageLineReaderTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/linereader/DuplicationLineReaderTest.java (77%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/linereader/HighlightingLineReaderTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/linereader/ScmLineReaderTest.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/source/linereader/SymbolsLineReaderTest.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/BaseStepTest.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/BuildComponentTreeStepTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java (84%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/CustomMeasuresCopyStepTest.java (83%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/DbMigrationsStepTest.java (93%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/DuplicationDataMeasuresStepTest.java (80%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/DuplicationMeasuresStepTest.java (90%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/EnableAnalysisStepTest.java (89%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ExecuteVisitorsStepTest.java (85%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ExtractReportStepTest.java (93%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/IndexAnalysisStepTest.java (77%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/LoadDuplicationsFromReportStepTest.java (86%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/LoadMeasureComputersStepTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/LoadPeriodsStepTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/LoadQualityGateStepTest.java (89%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/LoadQualityProfilesStepTest.java (89%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/NewSizeMeasuresStepTest.java (93%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistAnalysisPropertiesStepTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistComponentsStepTest.java (81%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java (87%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistEventsStepTest.java (83%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistExternalRulesStepTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistFileSourcesStepTest.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistIssuesStepTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistLiveMeasuresStepTest.java (86%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistMeasuresStepTest.java (86%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistProjectLinksStepTest.java (93%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistScannerContextStepTest.java (93%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistTestsStepTest.java (96%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PublishTaskResultStepTest.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/PurgeDatastoresStepTest.java (89%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/QualityGateEventsStepTest.java (91%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/QualityGateMeasuresStepTest.java (88%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/QualityProfileEventsStepTest.java (91%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ReportCommentMeasuresStepTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java (89%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ReportComputationStepsTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java (91%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java (85%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ReportLanguageDistributionMeasuresStepTest.java (85%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ReportNewCoverageMeasuresStepTest.java (91%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ReportPersistAnalysisStepTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ReportPersistComponentsStepTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ReportSizeMeasuresStepTest.java (87%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ReportUnitTestMeasuresStepTest.java (94%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/SendIssueNotificationsStepTest.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/SmallChangesetQualityGateSpecialCaseTest.java (83%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/TriggerViewRefreshStepTest.java (90%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java (89%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ValidateProjectStepTest.java (91%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/VerifyBillingStepTest.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ViewsCommentMeasuresStepTest.java (91%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java (89%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ViewsComputeMeasureVariationsStepTest.java (88%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ViewsCoverageMeasuresStepTest.java (87%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ViewsLanguageDistributionMeasuresStepTest.java (85%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ViewsNewCoverageMeasuresStepTest.java (87%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ViewsPersistAnalysisStepTest.java (87%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ViewsPersistComponentsStepTest.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ViewsSizeMeasuresStepTest.java (90%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/step/ViewsUnitTestMeasuresStepTest.java (92%) rename server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/{server/computation => ce}/task/projectanalysis/webhook/WebhookPostTaskTest.java (97%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/dbmigration/PopulateFileSourceLineCountTest/file_sources.sql (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1235_add_component_uuid_to_duplications_index.rb (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1236_populate_component_uuid_of_duplications_index.rb (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1237_delete_orphan_duplications_index_rows_without_component.rb (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1238_make_component_uuid_not_null_on_duplications_index.rb (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1239_add_analysis_uuid_to_duplications_index.rb (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1240_populate_analysis_uuid_of_duplications_index.rb (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1241_delete_orphan_duplications_index_rows_without_analysis.rb (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1242_make_analysis_uuid_not_null_on_duplications_index.rb (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddAnalysisUuidColumnToDuplicationsIndex.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddComponentUuidColumnToDuplicationsIndex.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1235_add_component_uuid_and_analysis_uuid_to_duplications_index.rb (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1236_populate_component_uuid_and_analysis_uuid_of_duplications_index.rb (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1237_delete_orphan_duplications_index_rows_without_component_or_analysis.rb (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1238_make_component_uuid_and_analysis_uuid_not_null_on_duplications_index.rb (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/AddComponentUuidAndAnalysisUuidColumnToDuplicationsIndex.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex.java (95%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie.json (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie_conflict.json (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/issue/SourceLinesCacheTest/load_data.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MeasureRepositoryImplTest/shared.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/measure/MetricCacheTest/metrics.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/metric/MetricRepositoryImplTest/shared.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/CustomMeasuresCopyStepTest/report-custom-measures.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/CustomMeasuresCopyStepTest/view-custom-measures.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/IndexSourceLinesStepTest/index_source.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/IndexTestsStepTest/index_source.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file-result.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistEventsStepTest/add_events-result.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistEventsStepTest/add_version_event-result.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistEventsStepTest/empty.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version-result.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistEventsStepTest/nothing_to_do_when_no_events_in_report.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistEventsStepTest/persist_report_events_with_component_children-result.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistMeasuresStepTest/shared.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/empty.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-index-result.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-report-result.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/ReportExtractionStepTest/demozip.zip (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/SwitchSnapshotStepTest/empty.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots-result.xml (100%) rename server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/{server/computation => ce}/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots.xml (100%) diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/ProjectAnalysisTaskModule.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/ProjectAnalysisTaskModule.java similarity index 78% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/ProjectAnalysisTaskModule.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/ProjectAnalysisTaskModule.java index 5450b4e38cb..e6252cf2743 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/ProjectAnalysisTaskModule.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/ProjectAnalysisTaskModule.java @@ -17,12 +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.task.projectanalysis; +package org.sonar.ce.task.projectanalysis; +import org.sonar.ce.task.projectanalysis.container.ContainerFactoryImpl; +import org.sonar.ce.task.projectanalysis.taskprocessor.ReportTaskProcessor; import org.sonar.server.computation.queue.ReportSubmitter; import org.sonar.core.platform.Module; -import org.sonar.server.computation.task.projectanalysis.container.ContainerFactoryImpl; -import org.sonar.server.computation.task.projectanalysis.taskprocessor.ReportTaskProcessor; +import org.sonar.ce.task.projectanalysis.container.ContainerFactoryImpl; +import org.sonar.ce.task.projectanalysis.taskprocessor.ReportTaskProcessor; import org.sonar.server.computation.task.step.ComputationStepExecutor; public class ProjectAnalysisTaskModule extends Module { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Analysis.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/Analysis.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Analysis.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/Analysis.java index 6be64fcf103..0feb3955731 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Analysis.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.analysis; +package org.sonar.ce.task.projectanalysis.analysis; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/AnalysisMetadataHolder.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolder.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/AnalysisMetadataHolder.java index b1035913934..f6d436f06a8 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/AnalysisMetadataHolder.java @@ -17,7 +17,7 @@ * along with this program; 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.analysis; +package org.sonar.ce.task.projectanalysis.analysis; import java.util.Map; import javax.annotation.CheckForNull; @@ -113,11 +113,11 @@ public interface AnalysisMetadataHolder { * * In case of analysis of main branch, the returned value is the main branch, * so its uuid and key are the same in - * {@link org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder#getRoot(). + * {@link org.sonar.ce.task.projectanalysis.component.TreeRootHolder#getRoot(). * * In case of analysis of non-main branch or pull request, the returned value * is the main branch. Its uuid and key are different than - * {@link org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder#getRoot(). + * {@link org.sonar.ce.task.projectanalysis.component.TreeRootHolder#getRoot(). * * @throws IllegalStateException if project has not been set */ diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/AnalysisMetadataHolderImpl.java similarity index 99% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/AnalysisMetadataHolderImpl.java index 2fd4d7154d8..ed4ba4c8eea 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/AnalysisMetadataHolderImpl.java @@ -17,7 +17,7 @@ * along with this program; 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.analysis; +package org.sonar.ce.task.projectanalysis.analysis; import com.google.common.collect.ImmutableMap; import java.util.Map; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Branch.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/Branch.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Branch.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/Branch.java index c5defbb698a..907b7e19dd8 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Branch.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/Branch.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.task.projectanalysis.analysis; +package org.sonar.ce.task.projectanalysis.analysis; import java.util.Optional; import javax.annotation.concurrent.Immutable; +import org.sonar.ce.task.projectanalysis.component.ComponentKeyGenerator; import org.sonar.db.component.BranchType; -import org.sonar.server.computation.task.projectanalysis.component.ComponentKeyGenerator; +import org.sonar.ce.task.projectanalysis.component.ComponentKeyGenerator; @Immutable public interface Branch extends ComponentKeyGenerator { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/MutableAnalysisMetadataHolder.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolder.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/MutableAnalysisMetadataHolder.java index 6727de64387..9e5714ae853 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/MutableAnalysisMetadataHolder.java @@ -17,7 +17,7 @@ * along with this program; 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.analysis; +package org.sonar.ce.task.projectanalysis.analysis; import java.util.Map; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Organization.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/Organization.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Organization.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/Organization.java index c48b07ab9fe..9554e432a04 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/Organization.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/Organization.java @@ -17,7 +17,7 @@ * along with this program; 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.analysis; +package org.sonar.ce.task.projectanalysis.analysis; import javax.annotation.concurrent.Immutable; import org.sonar.db.organization.OrganizationDto; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/ProjectConfigurationFactory.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/ProjectConfigurationFactory.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/ProjectConfigurationFactory.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/ProjectConfigurationFactory.java index 4cb040efd85..65b1cdc9f93 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/ProjectConfigurationFactory.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/ProjectConfigurationFactory.java @@ -17,7 +17,7 @@ * along with this program; 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.analysis; +package org.sonar.ce.task.projectanalysis.analysis; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.config.Configuration; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/ScannerPlugin.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/ScannerPlugin.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/ScannerPlugin.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/ScannerPlugin.java index 6069300592a..93864705e5b 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/ScannerPlugin.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/ScannerPlugin.java @@ -17,7 +17,7 @@ * along with this program; 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.analysis; +package org.sonar.ce.task.projectanalysis.analysis; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/package-info.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/package-info.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/package-info.java index 18292d432f1..6c51c76d0da 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/package-info.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/analysis/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.computation.task.projectanalysis; +package org.sonar.ce.task.projectanalysis.analysis; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/ComponentImpl.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/ComponentImpl.java index 25aa22867a7..cc5f5195609 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.api.measurecomputer; +package org.sonar.ce.task.projectanalysis.api.measurecomputer; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java similarity index 79% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java index 30999eea396..02ccfa25b24 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.api.measurecomputer; +package org.sonar.ce.task.projectanalysis.api.measurecomputer; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -35,15 +35,15 @@ import org.sonar.api.ce.measure.Measure; import org.sonar.api.ce.measure.MeasureComputer.MeasureComputerContext; import org.sonar.api.ce.measure.MeasureComputer.MeasureComputerDefinition; import org.sonar.api.ce.measure.Settings; +import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; +import org.sonar.ce.task.projectanalysis.issue.ComponentIssuesRepository; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.task.projectanalysis.component.ConfigurationRepository; -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.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.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.task.projectanalysis.component.Component internalComponent; + private final org.sonar.ce.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.task.projectanalysis.component.Component component, ConfigurationRepository config, + public MeasureComputerContextImpl(org.sonar.ce.task.projectanalysis.component.Component component, ConfigurationRepository config, MeasureRepository measureRepository, MetricRepository metricRepository, ComponentIssuesRepository componentIssuesRepository) { this.config = config; this.internalComponent = component; @@ -110,7 +110,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()); } @@ -178,17 +178,17 @@ public class MeasureComputerContextImpl implements MeasureComputerContext { return componentIssues; } - private static Component newComponent(org.sonar.server.computation.task.projectanalysis.component.Component component) { + private static Component newComponent(org.sonar.ce.task.projectanalysis.component.Component component) { return new ComponentImpl( component.getKey(), Component.Type.valueOf(component.getType().name()), - component.getType() == org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE + component.getType() == org.sonar.ce.task.projectanalysis.component.Component.Type.FILE ? new ComponentImpl.FileAttributesImpl(component.getFileAttributes().getLanguageKey(), component.getFileAttributes().isUnitTest()) : null); } private class ComponentToMeasure - implements Function> { + implements Function> { private final Metric metric; @@ -197,17 +197,17 @@ public class MeasureComputerContextImpl implements MeasureComputerContext { } @Override - public Optional apply(@Nonnull org.sonar.server.computation.task.projectanalysis.component.Component input) { + public Optional apply(@Nonnull org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImpl.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImpl.java index ae183939f1e..43974057487 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.api.measurecomputer; +package org.sonar.ce.task.projectanalysis.api.measurecomputer; import com.google.common.collect.ImmutableSet; import java.util.Set; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerWrapper.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/MeasureComputerWrapper.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerWrapper.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/MeasureComputerWrapper.java index 9fdbc75648c..b999d695f32 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerWrapper.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.api.measurecomputer; +package org.sonar.ce.task.projectanalysis.api.measurecomputer; import javax.annotation.concurrent.Immutable; import org.sonar.api.ce.measure.MeasureComputer; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/MeasureImpl.java similarity index 69% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/MeasureImpl.java index 1f078033e46..647a919d8fd 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.api.measurecomputer; +package org.sonar.ce.task.projectanalysis.api.measurecomputer; import java.util.EnumSet; import java.util.Locale; @@ -27,20 +27,20 @@ import org.sonar.api.ce.measure.Measure; import static com.google.common.base.Preconditions.checkState; import static java.lang.String.format; import static java.util.Objects.requireNonNull; -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; +import static org.sonar.ce.task.projectanalysis.measure.Measure.ValueType.BOOLEAN; +import static org.sonar.ce.task.projectanalysis.measure.Measure.ValueType.DOUBLE; +import static org.sonar.ce.task.projectanalysis.measure.Measure.ValueType.INT; +import static org.sonar.ce.task.projectanalysis.measure.Measure.ValueType.LONG; +import static org.sonar.ce.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.task.projectanalysis.measure.Measure measure; + private final org.sonar.ce.task.projectanalysis.measure.Measure measure; - public MeasureImpl(org.sonar.server.computation.task.projectanalysis.measure.Measure measure) { + public MeasureImpl(org.sonar.ce.task.projectanalysis.measure.Measure measure) { this.measure = requireNonNull(measure, "Measure couldn't be null"); checkState(ALLOWED_VALUE_TYPES.contains(measure.getValueType()), "Only following types are allowed %s", ALLOWED_VALUE_TYPES); } @@ -75,7 +75,7 @@ public class MeasureImpl implements Measure { return measure.getBooleanValue(); } - private void checkValueType(org.sonar.server.computation.task.projectanalysis.measure.Measure.ValueType expected) { + private void checkValueType(org.sonar.ce.task.projectanalysis.measure.Measure.ValueType expected) { if (measure.getValueType() != expected) { throw new IllegalStateException(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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/package-info.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/package-info.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/package-info.java index 69e4137721e..551562fbe3a 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/package-info.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.computation.task.projectanalysis.scm; +package org.sonar.ce.task.projectanalysis.api.measurecomputer; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/BranchImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/BranchImpl.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/BranchImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/BranchImpl.java index 73bb459687a..df89507d554 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/BranchImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/BranchImpl.java @@ -17,7 +17,7 @@ * along with this program; 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.api.posttask; +package org.sonar.ce.task.projectanalysis.api.posttask; import java.util.Optional; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/CeTaskImpl.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/CeTaskImpl.java index dc07cae120e..488dda2ad58 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.api.posttask; +package org.sonar.ce.task.projectanalysis.api.posttask; import javax.annotation.concurrent.Immutable; import org.sonar.api.ce.posttask.CeTask; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/ConditionImpl.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/ConditionImpl.java index 3768837d1d4..4d1f177850c 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.api.posttask; +package org.sonar.ce.task.projectanalysis.api.posttask; import javax.annotation.CheckForNull; import javax.annotation.concurrent.Immutable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToCondition.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/ConditionToCondition.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToCondition.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/ConditionToCondition.java index ba51a3aaa51..6a34c9e3c1c 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToCondition.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/ConditionToCondition.java @@ -17,14 +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.task.projectanalysis.api.posttask; +package org.sonar.ce.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.task.projectanalysis.qualitygate.Condition; -import org.sonar.server.computation.task.projectanalysis.qualitygate.ConditionStatus; +import org.sonar.ce.task.projectanalysis.qualitygate.Condition; +import org.sonar.ce.task.projectanalysis.qualitygate.ConditionStatus; +import org.sonar.ce.task.projectanalysis.qualitygate.Condition; +import org.sonar.ce.task.projectanalysis.qualitygate.ConditionStatus; import static com.google.common.base.Preconditions.checkState; import static java.lang.String.format; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java index 55540ec2617..b25d685d67b 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.api.posttask; +package org.sonar.ce.task.projectanalysis.api.posttask; import java.util.Collection; import java.util.Date; @@ -37,14 +37,14 @@ import org.sonar.api.ce.posttask.ScannerContext; import org.sonar.api.utils.System2; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.qualitygate.Condition; +import org.sonar.ce.task.projectanalysis.qualitygate.ConditionStatus; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateHolder; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateStatus; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateStatusHolder; import org.sonar.core.util.stream.MoreCollectors; -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.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 java.lang.String.format; @@ -133,7 +133,7 @@ public class PostProjectAnalysisTasksExecutor implements ComputationStepExecutor if (!analysisMetadataHolder.isOrganizationsEnabled()) { return null; } - org.sonar.server.computation.task.projectanalysis.analysis.Organization organization = analysisMetadataHolder.getOrganization(); + org.sonar.ce.task.projectanalysis.analysis.Organization organization = analysisMetadataHolder.getOrganization(); return new OrganizationImpl(organization.getName(), organization.getKey()); } @@ -164,9 +164,9 @@ public class PostProjectAnalysisTasksExecutor implements ComputationStepExecutor @CheckForNull private QualityGateImpl createQualityGate() { - Optional qualityGateOptional = this.qualityGateHolder.getQualityGate(); + Optional qualityGateOptional = this.qualityGateHolder.getQualityGate(); if (qualityGateOptional.isPresent()) { - org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGate qualityGate = qualityGateOptional.get(); + org.sonar.ce.task.projectanalysis.qualitygate.QualityGate qualityGate = qualityGateOptional.get(); return new QualityGateImpl( String.valueOf(qualityGate.getId()), @@ -179,7 +179,7 @@ public class PostProjectAnalysisTasksExecutor implements ComputationStepExecutor @CheckForNull private BranchImpl createBranch() { - org.sonar.server.computation.task.projectanalysis.analysis.Branch analysisBranch = analysisMetadataHolder.getBranch(); + org.sonar.ce.task.projectanalysis.analysis.Branch analysisBranch = analysisMetadataHolder.getBranch(); if (!analysisBranch.isLegacyFeature()) { String branchKey = analysisBranch.getType() == PULL_REQUEST ? analysisBranch.getPullRequestKey() : analysisBranch.getName(); return new BranchImpl(analysisBranch.isMain(), branchKey, Branch.Type.valueOf(analysisBranch.getType().name())); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/ProjectImpl.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/ProjectImpl.java index f449278c77b..f4b0ad65db5 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.api.posttask; +package org.sonar.ce.task.projectanalysis.api.posttask; import javax.annotation.concurrent.Immutable; import org.sonar.api.ce.posttask.Project; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/QualityGateImpl.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/QualityGateImpl.java index 44de6259af7..1d78f9951b5 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.api.posttask; +package org.sonar.ce.task.projectanalysis.api.posttask; import com.google.common.collect.ImmutableList; import java.util.Collection; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ScannerContextImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/ScannerContextImpl.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ScannerContextImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/ScannerContextImpl.java index 9b8fb9b7a02..8c1f1845dd4 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ScannerContextImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/ScannerContextImpl.java @@ -17,7 +17,7 @@ * along with this program; 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.api.posttask; +package org.sonar.ce.task.projectanalysis.api.posttask; import com.google.common.collect.ImmutableMap; import java.util.Map; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/package-info.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/package-info.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/package-info.java index 5c88dbea873..19709ab4240 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/package-info.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.computation.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.api.posttask; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportDirectoryHolder.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolder.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportDirectoryHolder.java index 66e97fae4e2..7f4314761d3 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.batch; +package org.sonar.ce.task.projectanalysis.batch; import java.io.File; import org.sonar.ce.queue.CeTask; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportDirectoryHolderImpl.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportDirectoryHolderImpl.java index c2c4d45331f..88c7da39ca2 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.batch; +package org.sonar.ce.task.projectanalysis.batch; import java.io.File; import java.util.Objects; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReader.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportReader.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReader.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportReader.java index a2f2f7f5b99..961add8e05f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReader.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.batch; +package org.sonar.ce.task.projectanalysis.batch; import java.util.Optional; import javax.annotation.CheckForNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportReaderImpl.java similarity index 99% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportReaderImpl.java index 6ab94994138..ff33320a682 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.batch; +package org.sonar.ce.task.projectanalysis.batch; import com.google.common.base.Throwables; import com.google.protobuf.InvalidProtocolBufferException; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/MutableBatchReportDirectoryHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/MutableBatchReportDirectoryHolder.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/MutableBatchReportDirectoryHolder.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/MutableBatchReportDirectoryHolder.java index c3c193776cd..35d26f9ab43 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/MutableBatchReportDirectoryHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.batch; +package org.sonar.ce.task.projectanalysis.batch; import java.io.File; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/view/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/package-info.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/view/package-info.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/package-info.java index 71d363304b5..21415a0c078 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/view/package-info.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.computation.task.projectanalysis.view; +package org.sonar.ce.task.projectanalysis.batch; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/BranchLoader.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchLoader.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/BranchLoader.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchLoader.java index dc9740fbdda..9341e29a09d 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/BranchLoader.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchLoader.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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import javax.annotation.Nullable; import org.sonar.api.utils.MessageException; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.task.projectanalysis.analysis.MutableAnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolder; import static org.apache.commons.lang.StringUtils.trimToNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/BranchLoaderDelegate.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchLoaderDelegate.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/BranchLoaderDelegate.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchLoaderDelegate.java index 1755bb29ca0..f19d9d3e8c1 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/BranchLoaderDelegate.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchLoaderDelegate.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.scanner.protocol.output.ScannerReport; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/BranchPersister.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchPersister.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/BranchPersister.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchPersister.java index 08b562daf73..c5ec6267c55 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/BranchPersister.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchPersister.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import org.sonar.db.DbSession; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/BranchPersisterImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchPersisterImpl.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/BranchPersisterImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchPersisterImpl.java index 25583a007e6..dd11b363d3f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/BranchPersisterImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/BranchPersisterImpl.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.Date; import javax.annotation.Nullable; @@ -28,8 +28,8 @@ import org.sonar.db.component.BranchDto; import org.sonar.db.component.BranchType; import org.sonar.db.component.ComponentDto; import org.sonar.db.protobuf.DbProjectBranches; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.Branch; import static org.sonar.db.component.ComponentDto.UUID_PATH_OF_ROOT; import static org.sonar.db.component.ComponentDto.UUID_PATH_SEPARATOR; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Component.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/Component.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Component.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/Component.java index 496a735e2d9..af7a00e2ed5 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Component.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.EnumSet; import java.util.List; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentCrawler.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentCrawler.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentCrawler.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentCrawler.java index c3ae0f7f674..ef61d06f45e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentCrawler.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; /** * Allow to crawl a component tree from a given component diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctions.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentFunctions.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctions.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentFunctions.java index 0b41049432f..e9f5fe5b03e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctions.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import com.google.common.base.Function; import javax.annotation.Nonnull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentImpl.java similarity index 99% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentImpl.java index 6bbbd309781..a84693e9f42 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import com.google.common.collect.ImmutableList; import java.util.ArrayList; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentKeyGenerator.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentKeyGenerator.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentKeyGenerator.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentKeyGenerator.java index c17113a6277..a465e5a1537 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentKeyGenerator.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentKeyGenerator.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import javax.annotation.Nullable; import org.sonar.scanner.protocol.output.ScannerReport; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTreeBuilder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentTreeBuilder.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTreeBuilder.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentTreeBuilder.java index b6964fb1532..de1daa2c153 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTreeBuilder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentTreeBuilder.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.List; import java.util.function.Function; @@ -27,7 +27,7 @@ import javax.annotation.Nullable; import org.sonar.db.component.SnapshotDto; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.Component.FileStatus; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.analysis.Branch; import org.sonar.server.project.Project; import static com.google.common.base.MoreObjects.firstNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentUuidFactory.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentUuidFactory.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentUuidFactory.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentUuidFactory.java index aa1644c975f..edcbbafbd86 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentUuidFactory.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentUuidFactory.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.HashMap; import java.util.List; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentVisitor.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentVisitor.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentVisitor.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ComponentVisitor.java index d6032c60de7..a26482e6def 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ComponentVisitor.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; public interface ComponentVisitor { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ConfigurationRepository.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ConfigurationRepository.java index 381366e3ea5..f6116009bc6 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ConfigurationRepository.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import org.sonar.api.config.Configuration; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ConfigurationRepositoryImpl.java similarity index 81% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ConfigurationRepositoryImpl.java index 736bf014cfa..90b5ad5d01e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ConfigurationRepositoryImpl.java @@ -17,13 +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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import org.sonar.api.config.Configuration; -import org.sonar.server.computation.task.projectanalysis.analysis.ProjectConfigurationFactory; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.ProjectConfigurationFactory; +import org.sonar.ce.task.projectanalysis.analysis.ProjectConfigurationFactory; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; /** * Repository of component settings implementation based on a memory cache. diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimit.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/CrawlerDepthLimit.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimit.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/CrawlerDepthLimit.java index 79cad9867d4..97df7596286 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimit.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DbIdsRepository.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DbIdsRepository.java index 738238d4a0c..298310f1e17 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; public interface DbIdsRepository { /** diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DbIdsRepositoryImpl.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DbIdsRepositoryImpl.java index e7d026eba02..29ccae8210d 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; -import static org.sonar.server.computation.task.projectanalysis.component.ComponentFunctions.toReportRef; +import static org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DefaultBranchImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DefaultBranchImpl.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DefaultBranchImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DefaultBranchImpl.java index 341174f1a6b..7d7fd491957 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DefaultBranchImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DefaultBranchImpl.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.Optional; import javax.annotation.Nullable; @@ -26,7 +26,7 @@ import org.sonar.core.component.ComponentKeys; import org.sonar.db.component.BranchDto; import org.sonar.db.component.BranchType; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.analysis.Branch; import static java.lang.String.format; import static org.apache.commons.lang.StringUtils.isEmpty; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DepthTraversalTypeAwareCrawler.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DepthTraversalTypeAwareCrawler.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DepthTraversalTypeAwareCrawler.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DepthTraversalTypeAwareCrawler.java index fd2f14d61d1..6a36afaf740 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DepthTraversalTypeAwareCrawler.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DequeBasedPath.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DequeBasedPath.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DequeBasedPath.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DequeBasedPath.java index 5e79c69c01b..a44c362840f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DequeBasedPath.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.ArrayDeque; import java.util.Deque; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Developer.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/Developer.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Developer.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/Developer.java index d94d8848bc8..ae5392df013 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Developer.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; /** * Developers are created by the Developer Cockpit plugin diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DisabledComponentsHolder.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolder.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DisabledComponentsHolder.java index 25c6a8ce340..e417d6cfa4e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.Collection; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DisabledComponentsHolderImpl.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/DisabledComponentsHolderImpl.java index 605fe2fb941..cf5ad1eeeb9 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.Collection; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributes.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/FileAttributes.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributes.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/FileAttributes.java index a3d02c2857a..833a8acbf6d 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributes.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/FileAttributes.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import javax.annotation.CheckForNull; import javax.annotation.Nullable; @@ -26,7 +26,7 @@ import javax.annotation.concurrent.Immutable; import static com.google.common.base.Preconditions.checkArgument; /** - * The attributes specific to a Component of type {@link org.sonar.server.computation.task.projectanalysis.component.Component.Type#FILE}. + * The attributes specific to a Component of type {@link Component.Type#FILE}. */ @Immutable public class FileAttributes { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MapBasedDbIdsRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/MapBasedDbIdsRepository.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MapBasedDbIdsRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/MapBasedDbIdsRepository.java index e365a67044f..153faca37ac 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MapBasedDbIdsRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import com.google.common.base.Function; import java.util.HashMap; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MergeBranchComponentUuids.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/MergeBranchComponentUuids.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MergeBranchComponentUuids.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/MergeBranchComponentUuids.java index 1ec0b9e1d3b..9e5f919776b 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MergeBranchComponentUuids.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/MergeBranchComponentUuids.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.HashMap; import java.util.List; @@ -28,7 +28,7 @@ import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.component.BranchDto; import org.sonar.db.component.ComponentDto; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; import static com.google.common.base.Preconditions.checkState; import static org.sonar.db.component.ComponentDto.removeBranchAndPullRequestFromKey; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/MutableDbIdsRepository.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/MutableDbIdsRepository.java index 6c87fe048aa..291ee8dbd16 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; public interface MutableDbIdsRepository extends DbIdsRepository { /** diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDisabledComponentsHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/MutableDisabledComponentsHolder.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDisabledComponentsHolder.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/MutableDisabledComponentsHolder.java index 59a78bb76de..83f4ab6ea1f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableDisabledComponentsHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.Collection; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/MutableTreeRootHolder.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolder.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/MutableTreeRootHolder.java index b09fa5a2b52..880286b1161 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; public interface MutableTreeRootHolder extends TreeRootHolder { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCrawler.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/PathAwareCrawler.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCrawler.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/PathAwareCrawler.java index b02028c2efa..ac1e3cba615 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCrawler.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.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.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; -import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitor.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/PathAwareVisitor.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitor.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/PathAwareVisitor.java index e4a6fc7d0ef..483a7eba274 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitor.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.NoSuchElementException; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorAdapter.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/PathAwareVisitorAdapter.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorAdapter.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/PathAwareVisitorAdapter.java index 1ee14e58fd4..bf6368d06f0 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorAdapter.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorWrapper.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/PathAwareVisitorWrapper.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorWrapper.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/PathAwareVisitorWrapper.java index 56446fcd7ef..a5f00ae1f6e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareVisitorWrapper.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import static java.lang.String.format; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathElementImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/PathElementImpl.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathElementImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/PathElementImpl.java index df1657b6f48..0d2eb31554a 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/PathElementImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import javax.annotation.concurrent.Immutable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ProjectViewAttributes.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ProjectViewAttributes.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ProjectViewAttributes.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ProjectViewAttributes.java index 547876afd44..a0ac8ba769f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ProjectViewAttributes.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ReportAttributes.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ReportAttributes.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ReportAttributes.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ReportAttributes.java index ee91b097244..0bee43d86a2 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ReportAttributes.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.Optional; import javax.annotation.CheckForNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ShortBranchComponentsWithIssues.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ShortBranchComponentsWithIssues.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ShortBranchComponentsWithIssues.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ShortBranchComponentsWithIssues.java index 71d97f257c5..66c44cf411f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ShortBranchComponentsWithIssues.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ShortBranchComponentsWithIssues.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.Collections; import java.util.HashMap; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/SubViewAttributes.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/SubViewAttributes.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/SubViewAttributes.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/SubViewAttributes.java index 44d6ec32c2c..8a55d279fca 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/SubViewAttributes.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/SubViewAttributes.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/TreeRootHolder.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolder.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/TreeRootHolder.java index 71ec3574017..a1d6e7b321d 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.Optional; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/TreeRootHolderImpl.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/TreeRootHolderImpl.java index 3d41f37a9f9..e4cf576fdb7 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.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.checkState; import static java.util.Objects.requireNonNull; -import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitor.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/TypeAwareVisitor.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitor.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/TypeAwareVisitor.java index 489d680c6fd..fdedd23e724 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitor.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; /** * A {@link ComponentVisitor} which can exposes methods which ensure the type of the visited Component. diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapter.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/TypeAwareVisitorAdapter.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapter.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/TypeAwareVisitorAdapter.java index e9cd4795ab2..5f4385a53b2 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapter.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorWrapper.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/TypeAwareVisitorWrapper.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorWrapper.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/TypeAwareVisitorWrapper.java index 5e6cc006e7f..179711bff50 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorWrapper.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; public class TypeAwareVisitorWrapper implements VisitorWrapper { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ViewAttributes.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ViewAttributes.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ViewAttributes.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ViewAttributes.java index 59de2133427..bf30db42d95 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/ViewAttributes.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/ViewAttributes.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.Arrays; import javax.annotation.concurrent.Immutable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitException.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/VisitException.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitException.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/VisitException.java index bbf1e477af9..c5085060c98 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitException.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import static java.lang.String.format; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorWrapper.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/VisitorWrapper.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorWrapper.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/VisitorWrapper.java index f3a70c18f0b..f6b4044ddca 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorWrapper.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; public interface VisitorWrapper extends TypeAwareVisitor { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorsCrawler.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/VisitorsCrawler.java similarity index 99% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorsCrawler.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/VisitorsCrawler.java index a6befcd3279..cb5058b71cf 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorsCrawler.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import com.google.common.base.Function; import com.google.common.base.Predicate; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/package-info.java new file mode 100644 index 00000000000..7e7869d1673 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/component/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.component; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactory.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ContainerFactory.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactory.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ContainerFactory.java index 3eb80dd697d..b7fdb7fc19f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactory.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ContainerFactory.java @@ -17,7 +17,7 @@ * along with this program; 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; +package org.sonar.ce.task.projectanalysis.container; import javax.annotation.Nullable; import org.sonar.ce.queue.CeTask; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ContainerFactoryImpl.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactoryImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ContainerFactoryImpl.java index d4ed76bcb15..b0d032a4bfb 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ContainerFactoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ContainerFactoryImpl.java @@ -17,7 +17,7 @@ * along with this program; 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; +package org.sonar.ce.task.projectanalysis.container; import javax.annotation.Nullable; import org.sonar.ce.queue.CeTask; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java new file mode 100644 index 00000000000..96835c017d6 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java @@ -0,0 +1,292 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.container; + +import java.util.Arrays; +import java.util.List; +import javax.annotation.Nullable; +import org.sonar.ce.organization.DefaultOrganizationLoader; +import org.sonar.ce.queue.CeTask; +import org.sonar.ce.settings.SettingsLoader; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderImpl; +import org.sonar.ce.task.projectanalysis.api.posttask.PostProjectAnalysisTasksExecutor; +import org.sonar.ce.task.projectanalysis.batch.BatchReportDirectoryHolderImpl; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderImpl; +import org.sonar.ce.task.projectanalysis.component.BranchLoader; +import org.sonar.ce.task.projectanalysis.component.BranchPersisterImpl; +import org.sonar.ce.task.projectanalysis.component.ConfigurationRepositoryImpl; +import org.sonar.ce.task.projectanalysis.component.DbIdsRepositoryImpl; +import org.sonar.ce.task.projectanalysis.component.DisabledComponentsHolderImpl; +import org.sonar.ce.task.projectanalysis.component.MergeBranchComponentUuids; +import org.sonar.ce.task.projectanalysis.component.ShortBranchComponentsWithIssues; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderImpl; +import org.sonar.ce.task.projectanalysis.dbmigration.DbMigrationModule; +import org.sonar.ce.task.projectanalysis.duplication.CrossProjectDuplicationStatusHolderImpl; +import org.sonar.ce.task.projectanalysis.duplication.DuplicationMeasures; +import org.sonar.ce.task.projectanalysis.duplication.DuplicationRepositoryImpl; +import org.sonar.ce.task.projectanalysis.duplication.IntegrateCrossProjectDuplications; +import org.sonar.ce.task.projectanalysis.event.EventRepositoryImpl; +import org.sonar.ce.task.projectanalysis.filemove.FileSimilarityImpl; +import org.sonar.ce.task.projectanalysis.filemove.MutableMovedFilesRepositoryImpl; +import org.sonar.ce.task.projectanalysis.filemove.ScoreMatrixDumperImpl; +import org.sonar.ce.task.projectanalysis.filemove.SourceSimilarityImpl; +import org.sonar.ce.task.projectanalysis.filesystem.ComputationTempFolderProvider; +import org.sonar.ce.task.projectanalysis.issue.BaseIssuesLoader; +import org.sonar.ce.task.projectanalysis.issue.CloseIssuesOnRemovedComponentsVisitor; +import org.sonar.ce.task.projectanalysis.issue.ComponentIssuesLoader; +import org.sonar.ce.task.projectanalysis.issue.ComponentIssuesRepositoryImpl; +import org.sonar.ce.task.projectanalysis.issue.ComponentsWithUnprocessedIssues; +import org.sonar.ce.task.projectanalysis.issue.DebtCalculator; +import org.sonar.ce.task.projectanalysis.issue.DefaultAssignee; +import org.sonar.ce.task.projectanalysis.issue.EffortAggregator; +import org.sonar.ce.task.projectanalysis.issue.IntegrateIssuesVisitor; +import org.sonar.ce.task.projectanalysis.issue.IssueAssigner; +import org.sonar.ce.task.projectanalysis.issue.IssueCache; +import org.sonar.ce.task.projectanalysis.issue.IssueCounter; +import org.sonar.ce.task.projectanalysis.issue.IssueCreationDateCalculator; +import org.sonar.ce.task.projectanalysis.issue.IssueLifecycle; +import org.sonar.ce.task.projectanalysis.issue.IssueTrackingDelegator; +import org.sonar.ce.task.projectanalysis.issue.IssueVisitors; +import org.sonar.ce.task.projectanalysis.issue.IssuesRepositoryVisitor; +import org.sonar.ce.task.projectanalysis.issue.LoadComponentUuidsHavingOpenIssuesVisitor; +import org.sonar.ce.task.projectanalysis.issue.MergeBranchTrackerExecution; +import org.sonar.ce.task.projectanalysis.issue.MovedIssueVisitor; +import org.sonar.ce.task.projectanalysis.issue.NewEffortAggregator; +import org.sonar.ce.task.projectanalysis.issue.RemoveProcessedComponentsVisitor; +import org.sonar.ce.task.projectanalysis.issue.RuleRepositoryImpl; +import org.sonar.ce.task.projectanalysis.issue.RuleTagsCopier; +import org.sonar.ce.task.projectanalysis.issue.RuleTypeCopier; +import org.sonar.ce.task.projectanalysis.issue.ScmAccountToUser; +import org.sonar.ce.task.projectanalysis.issue.ScmAccountToUserLoader; +import org.sonar.ce.task.projectanalysis.issue.ShortBranchIssueMerger; +import org.sonar.ce.task.projectanalysis.issue.ShortBranchIssuesLoader; +import org.sonar.ce.task.projectanalysis.issue.ShortBranchTrackerExecution; +import org.sonar.ce.task.projectanalysis.issue.TrackerBaseInputFactory; +import org.sonar.ce.task.projectanalysis.issue.TrackerExecution; +import org.sonar.ce.task.projectanalysis.issue.TrackerMergeBranchInputFactory; +import org.sonar.ce.task.projectanalysis.issue.TrackerRawInputFactory; +import org.sonar.ce.task.projectanalysis.issue.UpdateConflictResolver; +import org.sonar.ce.task.projectanalysis.issue.commonrule.BranchCoverageRule; +import org.sonar.ce.task.projectanalysis.issue.commonrule.CommentDensityRule; +import org.sonar.ce.task.projectanalysis.issue.commonrule.CommonRuleEngineImpl; +import org.sonar.ce.task.projectanalysis.issue.commonrule.DuplicatedBlockRule; +import org.sonar.ce.task.projectanalysis.issue.commonrule.LineCoverageRule; +import org.sonar.ce.task.projectanalysis.issue.commonrule.SkippedTestRule; +import org.sonar.ce.task.projectanalysis.issue.commonrule.TestErrorRule; +import org.sonar.ce.task.projectanalysis.issue.filter.IssueFilter; +import org.sonar.ce.task.projectanalysis.language.LanguageRepositoryImpl; +import org.sonar.ce.task.projectanalysis.measure.MeasureComputersHolderImpl; +import org.sonar.ce.task.projectanalysis.measure.MeasureComputersVisitor; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryImpl; +import org.sonar.ce.task.projectanalysis.measure.MeasureToMeasureDto; +import org.sonar.ce.task.projectanalysis.metric.MetricModule; +import org.sonar.ce.task.projectanalysis.period.PeriodHolderImpl; +import org.sonar.ce.task.projectanalysis.qualitygate.EvaluationResultTextConverterImpl; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateHolderImpl; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateServiceImpl; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateStatusHolderImpl; +import org.sonar.ce.task.projectanalysis.qualitymodel.MaintainabilityMeasuresVisitor; +import org.sonar.ce.task.projectanalysis.qualitymodel.NewMaintainabilityMeasuresVisitor; +import org.sonar.ce.task.projectanalysis.qualitymodel.NewReliabilityAndSecurityRatingMeasuresVisitor; +import org.sonar.ce.task.projectanalysis.qualitymodel.RatingSettings; +import org.sonar.ce.task.projectanalysis.qualitymodel.ReliabilityAndSecurityRatingMeasuresVisitor; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolderImpl; +import org.sonar.ce.task.projectanalysis.scm.ScmInfoDbLoader; +import org.sonar.ce.task.projectanalysis.scm.ScmInfoRepositoryImpl; +import org.sonar.ce.task.projectanalysis.source.DbLineHashVersion; +import org.sonar.ce.task.projectanalysis.source.LastCommitVisitor; +import org.sonar.ce.task.projectanalysis.source.SignificantCodeRepository; +import org.sonar.ce.task.projectanalysis.source.SourceHashRepositoryImpl; +import org.sonar.ce.task.projectanalysis.source.SourceLinesDiffImpl; +import org.sonar.ce.task.projectanalysis.source.SourceLinesHashCache; +import org.sonar.ce.task.projectanalysis.source.SourceLinesHashRepositoryImpl; +import org.sonar.ce.task.projectanalysis.source.SourceLinesRepositoryImpl; +import org.sonar.ce.task.projectanalysis.step.ReportComputationSteps; +import org.sonar.ce.task.projectanalysis.step.SmallChangesetQualityGateSpecialCase; +import org.sonar.ce.task.projectanalysis.webhook.WebhookPostTask; +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.container.TaskContainer; +import org.sonar.server.computation.task.step.ComputationStepExecutor; +import org.sonar.server.computation.task.step.ComputationSteps; +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(DefaultOrganizationLoader.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(), + + DbMigrationModule.class, + + MetricModule.class, + + // holders + AnalysisMetadataHolderImpl.class, + CrossProjectDuplicationStatusHolderImpl.class, + BatchReportDirectoryHolderImpl.class, + TreeRootHolderImpl.class, + PeriodHolderImpl.class, + QualityGateHolderImpl.class, + QualityGateStatusHolderImpl.class, + RatingSettings.class, + ActiveRulesHolderImpl.class, + MeasureComputersHolderImpl.class, + MutableTaskResultHolderImpl.class, + BatchReportReaderImpl.class, + MergeBranchComponentUuids.class, + ShortBranchComponentsWithIssues.class, + + // repositories + LanguageRepositoryImpl.class, + MeasureRepositoryImpl.class, + EventRepositoryImpl.class, + ConfigurationRepositoryImpl.class, + DbIdsRepositoryImpl.class, + DisabledComponentsHolderImpl.class, + QualityGateServiceImpl.class, + EvaluationResultTextConverterImpl.class, + SourceLinesRepositoryImpl.class, + SourceHashRepositoryImpl.class, + SourceLinesDiffImpl.class, + ScmInfoRepositoryImpl.class, + ScmInfoDbLoader.class, + DuplicationRepositoryImpl.class, + SourceLinesHashRepositoryImpl.class, + DbLineHashVersion.class, + SignificantCodeRepository.class, + SourceLinesHashCache.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, + IssueCreationDateCalculator.class, + DebtCalculator.class, + EffortAggregator.class, + NewEffortAggregator.class, + IssueAssigner.class, + IssueCounter.class, + MovedIssueVisitor.class, + IssuesRepositoryVisitor.class, + RemoveProcessedComponentsVisitor.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, + MaintainabilityMeasuresVisitor.class, + NewMaintainabilityMeasuresVisitor.class, + ReliabilityAndSecurityRatingMeasuresVisitor.class, + NewReliabilityAndSecurityRatingMeasuresVisitor.class, + LastCommitVisitor.class, + MeasureComputersVisitor.class, + + UpdateConflictResolver.class, + TrackerBaseInputFactory.class, + TrackerRawInputFactory.class, + TrackerMergeBranchInputFactory.class, + Tracker.class, + TrackerExecution.class, + ShortBranchTrackerExecution.class, + MergeBranchTrackerExecution.class, + ComponentIssuesLoader.class, + BaseIssuesLoader.class, + IssueTrackingDelegator.class, + BranchPersisterImpl.class, + ShortBranchIssuesLoader.class, + ShortBranchIssueMerger.class, + + // filemove + ScoreMatrixDumperImpl.class, + SourceSimilarityImpl.class, + FileSimilarityImpl.class, + MutableMovedFilesRepositoryImpl.class, + + // duplication + IntegrateCrossProjectDuplications.class, + DuplicationMeasures.class, + + // views + ViewIndex.class, + + BranchLoader.class, + MeasureToMeasureDto.class, + SmallChangesetQualityGateSpecialCase.class, + + // webhooks + WebhookPostTask.class); + } + +} diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/package-info.java new file mode 100644 index 00000000000..01c528f87b5 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.container; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/DbMigrationModule.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/DbMigrationModule.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/DbMigrationModule.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/DbMigrationModule.java index b62d965d07f..e96e1ff561c 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/DbMigrationModule.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/DbMigrationModule.java @@ -17,7 +17,7 @@ * along with this program; 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.dbmigration; +package org.sonar.ce.task.projectanalysis.dbmigration; import org.sonar.core.platform.Module; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/PopulateFileSourceLineCount.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/PopulateFileSourceLineCount.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/PopulateFileSourceLineCount.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/PopulateFileSourceLineCount.java index a4fa5624196..7a5cde02d4e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/PopulateFileSourceLineCount.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/PopulateFileSourceLineCount.java @@ -17,7 +17,7 @@ * along with this program; 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.dbmigration; +package org.sonar.ce.task.projectanalysis.dbmigration; import com.google.common.collect.Iterables; import java.sql.SQLException; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/ProjectAnalysisDataChange.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/ProjectAnalysisDataChange.java similarity index 87% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/ProjectAnalysisDataChange.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/ProjectAnalysisDataChange.java index e8318434b53..e037f221741 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/ProjectAnalysisDataChange.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/ProjectAnalysisDataChange.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.task.projectanalysis.dbmigration; +package org.sonar.ce.task.projectanalysis.dbmigration; import org.sonar.server.platform.db.migration.step.MigrationStep; /** * Marker interface of {@link MigrationStep} for the implementations to be run in - * {@link org.sonar.server.computation.task.projectanalysis.step.DbMigrationsStep DbMigrationsStep}. + * {@link org.sonar.ce.task.projectanalysis.step.DbMigrationsStep DbMigrationsStep}. *

* {@link MigrationStep} execute during project report analysis should perform only data change operations. */ diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/ProjectAnalysisDataChanges.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/ProjectAnalysisDataChanges.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/ProjectAnalysisDataChanges.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/ProjectAnalysisDataChanges.java index c40b3dae60e..58e2d00cbbb 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/ProjectAnalysisDataChanges.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/ProjectAnalysisDataChanges.java @@ -17,7 +17,7 @@ * along with this program; 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.dbmigration; +package org.sonar.ce.task.projectanalysis.dbmigration; import java.util.List; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImpl.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImpl.java index 83b323881da..8dc70039808 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImpl.java @@ -17,7 +17,7 @@ * along with this program; 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.dbmigration; +package org.sonar.ce.task.projectanalysis.dbmigration; import java.util.Arrays; import java.util.List; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/package-info.java new file mode 100644 index 00000000000..a175f15c386 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dbmigration/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.dbmigration; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/AbstractDuplicate.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/AbstractDuplicate.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/AbstractDuplicate.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/AbstractDuplicate.java index 9cd5361043d..790d2ba4344 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/AbstractDuplicate.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicate.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/CrossProjectDuplicate.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicate.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/CrossProjectDuplicate.java index c4e870f2579..afe508ba153 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicate.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; import java.util.Objects; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolder.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolder.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolder.java index 25db3ef2168..c6e61b6fb2b 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; /** * A simple holder to know if the cross project duplication should be computed or not. diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImpl.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImpl.java index 1eac2dca397..c962a1dc363 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImpl.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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; 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.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; import static com.google.common.base.Preconditions.checkState; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DetailedTextBlock.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/DetailedTextBlock.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DetailedTextBlock.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/DetailedTextBlock.java index cab015f4716..e2033bdc3a5 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DetailedTextBlock.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; import java.util.Objects; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplicate.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/Duplicate.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplicate.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/Duplicate.java index b0ae8ddf704..e47ecc95de5 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplicate.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; public interface Duplicate { TextBlock getTextBlock(); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplication.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/Duplication.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplication.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/Duplication.java index 9763c7eaf72..ed735787f42 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/Duplication.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; import com.google.common.base.Function; import com.google.common.base.Predicate; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationMeasures.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/DuplicationMeasures.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationMeasures.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/DuplicationMeasures.java index ccc0fa686d2..c64942f5890 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationMeasures.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/DuplicationMeasures.java @@ -17,7 +17,7 @@ * along with this program; 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.duplication; +package org.sonar.ce.task.projectanalysis.duplication; import static com.google.common.collect.FluentIterable.from; import static com.google.common.collect.Iterables.isEmpty; @@ -36,18 +36,20 @@ import java.util.Set; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -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.Metric; -import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.formula.Counter; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.ce.task.projectanalysis.formula.Formula; +import org.sonar.ce.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/DuplicationRepository.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/DuplicationRepository.java index d1ca08aebe4..1a4e55c002e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/DuplicationRepository.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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; /** * Repository of code duplications in files of the project. diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/DuplicationRepositoryImpl.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/DuplicationRepositoryImpl.java index f3cf1c5ed82..c8255471fc0 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/DuplicationRepositoryImpl.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.task.projectanalysis.duplication; +package org.sonar.ce.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.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicate.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/InProjectDuplicate.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicate.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/InProjectDuplicate.java index c113e620414..45b9f33803d 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicate.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/InProjectDuplicate.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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; import java.util.Objects; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicate.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/InnerDuplicate.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicate.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/InnerDuplicate.java index 0cba1200f45..30303e3c8eb 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicate.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; import javax.annotation.concurrent.Immutable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplications.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/IntegrateCrossProjectDuplications.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplications.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/IntegrateCrossProjectDuplications.java index 918a9945110..cb7ba545a94 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplications.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -31,13 +31,14 @@ import org.sonar.api.CoreProperties; import org.sonar.api.config.Configuration; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.duplications.block.Block; import org.sonar.duplications.detector.suffixtree.SuffixTreeCloneDetectionAlgorithm; 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.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; import static com.google.common.collect.FluentIterable.from; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlock.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/TextBlock.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlock.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/TextBlock.java index c4af0e784e5..259e50e7381 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlock.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; import java.util.Objects; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/package-info.java new file mode 100644 index 00000000000..adba76d6730 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/duplication/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.duplication; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/event/Event.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/event/Event.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/event/Event.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/event/Event.java index 6b34df1b8e6..f9b2c369411 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/event/Event.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.event; +package org.sonar.ce.task.projectanalysis.event; import java.util.Objects; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/event/EventRepository.java similarity index 80% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/event/EventRepository.java index ee22f87345a..413b25f92a0 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/event/EventRepository.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.task.projectanalysis.event; +package org.sonar.ce.task.projectanalysis.event; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; -import static org.sonar.server.computation.task.projectanalysis.component.Component.Type; +import static org.sonar.ce.task.projectanalysis.component.Component.Type; public interface EventRepository { /** * @throws NullPointerException if {@code component} or {@code event} is {@code null} - * @throws IllegalArgumentException if type of {@code component} is not {@link Type#PROJECT} + * @throws IllegalArgumentException if type of {@code component} is not {@link Component.Type#PROJECT} */ void add(Component component, Event event); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/event/EventRepositoryImpl.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/event/EventRepositoryImpl.java index 721aef842f7..632a1b08752 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/event/EventRepositoryImpl.java @@ -17,11 +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.task.projectanalysis.event; +package org.sonar.ce.task.projectanalysis.event; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/event/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/event/package-info.java new file mode 100644 index 00000000000..c05db609911 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/event/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.event; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStep.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStep.java index 87d5fb161de..d7069351e74 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.filemove; +package org.sonar.ce.task.projectanalysis.filemove; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableList; @@ -40,27 +40,26 @@ import org.apache.ibatis.session.ResultContext; import org.apache.ibatis.session.ResultHandler; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.filemove.FileSimilarity.File; +import org.sonar.ce.task.projectanalysis.filemove.FileSimilarity.FileImpl; +import org.sonar.ce.task.projectanalysis.filemove.FileSimilarity.LazyFileImpl; +import org.sonar.ce.task.projectanalysis.source.SourceLinesHashRepository; import org.sonar.core.util.logs.Profiler; import org.sonar.core.util.stream.MoreCollectors; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.component.FileMoveRowDto; import org.sonar.db.source.LineHashesWithKeyDto; -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.source.SourceLinesHashRepository; -import org.sonar.server.computation.task.projectanalysis.filemove.FileSimilarity.FileImpl; -import org.sonar.server.computation.task.projectanalysis.filemove.FileSimilarity.LazyFileImpl; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesRepository; import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.FluentIterable.from; -import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarity.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/FileSimilarity.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarity.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/FileSimilarity.java index 65f99ff5079..690231b4929 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarity.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.filemove; +package org.sonar.ce.task.projectanalysis.filemove; import java.util.List; import java.util.Optional; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarityImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/FileSimilarityImpl.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarityImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/FileSimilarityImpl.java index 56bd0b4ddfb..731b5993aac 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarityImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.filemove; +package org.sonar.ce.task.projectanalysis.filemove; public class FileSimilarityImpl implements FileSimilarity { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/Match.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/Match.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/Match.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/Match.java index b8117606619..6d879d382e1 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/Match.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.filemove; +package org.sonar.ce.task.projectanalysis.filemove; import java.util.Objects; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScore.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/MatchesByScore.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScore.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/MatchesByScore.java index 075b8a20985..8945fff7f5e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScore.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.filemove; +package org.sonar.ce.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.task.projectanalysis.filemove.FileMoveDetectionStep.MIN_REQUIRED_SCORE; +import static org.sonar.ce.task.projectanalysis.filemove.FileMoveDetectionStep.MIN_REQUIRED_SCORE; abstract class MatchesByScore implements Iterable> { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MovedFilesRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/MovedFilesRepository.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MovedFilesRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/MovedFilesRepository.java index 1c03edd0c36..4b15b417cf4 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MovedFilesRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/MovedFilesRepository.java @@ -17,11 +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.task.projectanalysis.filemove; +package org.sonar.ce.task.projectanalysis.filemove; import com.google.common.base.Optional; import javax.annotation.Nullable; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/MutableMovedFilesRepository.java similarity index 81% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/MutableMovedFilesRepository.java index fce78dddf68..dbb0d7e8506 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/MutableMovedFilesRepository.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.task.projectanalysis.filemove; +package org.sonar.ce.task.projectanalysis.filemove; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; -import static org.sonar.server.computation.task.projectanalysis.component.Component.Type; +import static org.sonar.ce.task.projectanalysis.component.Component.Type; public interface MutableMovedFilesRepository extends MovedFilesRepository { /** * Registers the original file for the specified file of the report. * - * @throws IllegalArgumentException if {@code file} type is not {@link Type#FILE} + * @throws IllegalArgumentException if {@code file} type is not {@link Component.Type#FILE} * @throws IllegalStateException if {@code file} already has an original file */ void setOriginalFile(Component file, OriginalFile originalFile); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/MutableMovedFilesRepositoryImpl.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/MutableMovedFilesRepositoryImpl.java index b668b4a6ce6..dc7b0a6785a 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/MutableMovedFilesRepositoryImpl.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.task.projectanalysis.filemove; +package org.sonar.ce.task.projectanalysis.filemove; import com.google.common.base.Optional; import java.util.HashMap; import java.util.Map; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrix.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/ScoreMatrix.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrix.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/ScoreMatrix.java index 82701df2287..94c8af5d11d 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrix.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.filemove; +package org.sonar.ce.task.projectanalysis.filemove; import java.util.Arrays; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrixDumper.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/ScoreMatrixDumper.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrixDumper.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/ScoreMatrixDumper.java index 811820794bb..1c86f04f972 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrixDumper.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/ScoreMatrixDumper.java @@ -17,7 +17,7 @@ * along with this program; 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.filemove; +package org.sonar.ce.task.projectanalysis.filemove; public interface ScoreMatrixDumper { void dumpAsCsv(ScoreMatrix scoreMatrix); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrixDumperImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/ScoreMatrixDumperImpl.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrixDumperImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/ScoreMatrixDumperImpl.java index 5b97eed763d..9e0355635ff 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrixDumperImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/ScoreMatrixDumperImpl.java @@ -17,7 +17,7 @@ * along with this program; 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.filemove; +package org.sonar.ce.task.projectanalysis.filemove; import java.io.BufferedWriter; import java.io.IOException; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarity.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/SourceSimilarity.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarity.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/SourceSimilarity.java index 2ee9a1668e8..b7311af5d19 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarity.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.filemove; +package org.sonar.ce.task.projectanalysis.filemove; import java.util.List; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/SourceSimilarityImpl.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/SourceSimilarityImpl.java index 29c2464e08f..41946dc2b43 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.filemove; +package org.sonar.ce.task.projectanalysis.filemove; import java.util.List; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/package-info.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/package-info.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/package-info.java index 9b3bbaf5f15..62190cba51e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/package-info.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filemove/package-info.java @@ -18,6 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.computation.task.projectanalysis.batch; +package org.sonar.ce.task.projectanalysis.filemove; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/ComputationTempFolderProvider.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filesystem/ComputationTempFolderProvider.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/ComputationTempFolderProvider.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filesystem/ComputationTempFolderProvider.java index 3daa86ef397..425562e9e12 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/ComputationTempFolderProvider.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.filesystem; +package org.sonar.ce.task.projectanalysis.filesystem; import java.io.File; import java.io.IOException; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filesystem/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filesystem/package-info.java new file mode 100644 index 00000000000..780ce3acc43 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/filesystem/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.filesystem; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormula.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/AverageFormula.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormula.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/AverageFormula.java index 026c15ff350..e0158e51b72 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormula.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.formula; +package org.sonar.ce.task.projectanalysis.formula; import com.google.common.base.Optional; -import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.Measure; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Counter.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/Counter.java similarity index 77% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Counter.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/Counter.java index 2b411717d0f..416d7328a11 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Counter.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/Counter.java @@ -17,9 +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.task.projectanalysis.formula; +package org.sonar.ce.task.projectanalysis.formula; -import static org.sonar.server.computation.task.projectanalysis.component.Component.Type; +import org.sonar.ce.task.projectanalysis.component.Component; + +import static org.sonar.ce.task.projectanalysis.component.Component.Type; /** * A counter is used to aggregate some data @@ -33,8 +35,8 @@ public interface Counter> { void aggregate(T counter); /** - * This method is called on leaves of the Component tree (usually a {@link Type#FILE} or a {@link Type#PROJECT_VIEW} - * but can also be a {@link Type#SUBVIEW} or {@link Type#VIEW}) to initialize the counter. + * This method is called on leaves of the Component tree (usually a {@link Component.Type#FILE} or a {@link Component.Type#PROJECT_VIEW} + * but can also be a {@link Component.Type#SUBVIEW} or {@link Component.Type#VIEW}) to initialize the counter. */ void initialize(CounterInitializationContext context); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CounterInitializationContext.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/CounterInitializationContext.java similarity index 81% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CounterInitializationContext.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/CounterInitializationContext.java index 11fd3f07287..febac2da9a0 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CounterInitializationContext.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/CounterInitializationContext.java @@ -17,12 +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.task.projectanalysis.formula; +package org.sonar.ce.task.projectanalysis.formula; import com.google.common.base.Optional; -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; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.period.Period; /** * The context passing information to {@link Counter#initialize(CounterInitializationContext)}. diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CreateMeasureContext.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/CreateMeasureContext.java similarity index 77% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CreateMeasureContext.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/CreateMeasureContext.java index 380907f784b..ce626a1d9bc 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/CreateMeasureContext.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/CreateMeasureContext.java @@ -17,11 +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.task.projectanalysis.formula; +package org.sonar.ce.task.projectanalysis.formula; -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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.period.Period; /** * Context passing information to implementation of {@link Formula#createMeasure(Counter, CreateMeasureContext)} method. diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormula.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/DistributionFormula.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormula.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/DistributionFormula.java index 453b77a76c7..cf688c6dbe2 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormula.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/DistributionFormula.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.task.projectanalysis.formula; +package org.sonar.ce.task.projectanalysis.formula; import com.google.common.base.Optional; import org.sonar.api.ce.measure.RangeDistributionBuilder; -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 org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.measure.Measure; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Formula.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/Formula.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Formula.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/Formula.java index bc6bda836a7..848dcd7ad49 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/Formula.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.formula; +package org.sonar.ce.task.projectanalysis.formula; import com.google.common.base.Optional; -import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.Measure; /** * A formula is used to aggregated data on all nodes of a component tree diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/FormulaExecutorComponentVisitor.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/FormulaExecutorComponentVisitor.java similarity index 87% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/FormulaExecutorComponentVisitor.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/FormulaExecutorComponentVisitor.java index 35b5035fbdd..84f5a910541 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/FormulaExecutorComponentVisitor.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.formula; +package org.sonar.ce.task.projectanalysis.formula; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; @@ -25,16 +25,23 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import javax.annotation.CheckForNull; -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.PeriodHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ComponentVisitor; +import org.sonar.ce.task.projectanalysis.component.PathAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ComponentVisitor; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.PathAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolder; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormula.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/SumFormula.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormula.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/SumFormula.java index 7147359bef0..a95bee24b0c 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormula.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.formula; +package org.sonar.ce.task.projectanalysis.formula; import com.google.common.base.Optional; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -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 org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.formula.counter.IntSumCounter; +import org.sonar.ce.task.projectanalysis.formula.counter.LongSumCounter; +import org.sonar.ce.task.projectanalysis.formula.counter.SumCounter; +import org.sonar.ce.task.projectanalysis.measure.Measure; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/VariationSumFormula.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/VariationSumFormula.java similarity index 86% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/VariationSumFormula.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/VariationSumFormula.java index 9f5413dfb8e..b1672b58c63 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/VariationSumFormula.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/VariationSumFormula.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.task.projectanalysis.formula; +package org.sonar.ce.task.projectanalysis.formula; import com.google.common.base.Optional; -import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; -import org.sonar.server.computation.task.projectanalysis.formula.counter.DoubleValue; -import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.formula.counter.DoubleValue; +import org.sonar.ce.task.projectanalysis.measure.Measure; import static java.util.Objects.requireNonNull; -import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleValue.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/DoubleValue.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleValue.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/DoubleValue.java index 6f9776787ef..eff7ddd62a7 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleValue.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/DoubleValue.java @@ -17,7 +17,7 @@ * along with this program; 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.formula.counter; +package org.sonar.ce.task.projectanalysis.formula.counter; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounter.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/IntSumCounter.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounter.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/IntSumCounter.java index 5f35a632b76..f941889cc04 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounter.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/IntSumCounter.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.task.projectanalysis.formula.counter; +package org.sonar.ce.task.projectanalysis.formula.counter; import com.google.common.base.Optional; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; -import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.task.projectanalysis.measure.Measure; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntValue.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/IntValue.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntValue.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/IntValue.java index cf3b97e4b44..cf63c6b0f13 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntValue.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/IntValue.java @@ -17,7 +17,7 @@ * along with this program; 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.formula.counter; +package org.sonar.ce.task.projectanalysis.formula.counter; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounter.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/LongSumCounter.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounter.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/LongSumCounter.java index 66e6422c6f1..d395e9deb65 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounter.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/LongSumCounter.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.task.projectanalysis.formula.counter; +package org.sonar.ce.task.projectanalysis.formula.counter; import com.google.common.base.Optional; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; -import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.task.projectanalysis.measure.Measure; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongValue.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/LongValue.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongValue.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/LongValue.java index dcb93d17de2..22357da128f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongValue.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/LongValue.java @@ -17,7 +17,7 @@ * along with this program; 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.formula.counter; +package org.sonar.ce.task.projectanalysis.formula.counter; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/RatingValue.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/RatingValue.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/RatingValue.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/RatingValue.java index 39ce513fd44..87a704dcb02 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/RatingValue.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/RatingValue.java @@ -17,7 +17,7 @@ * along with this program; 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.formula.counter; +package org.sonar.ce.task.projectanalysis.formula.counter; import javax.annotation.Nullable; import org.sonar.server.measure.Rating; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/SumCounter.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/SumCounter.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/SumCounter.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/SumCounter.java index b295a4a3a14..40a422d095c 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/SumCounter.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/SumCounter.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.task.projectanalysis.formula.counter; +package org.sonar.ce.task.projectanalysis.formula.counter; import com.google.common.base.Optional; -import org.sonar.server.computation.task.projectanalysis.formula.Counter; +import org.sonar.ce.task.projectanalysis.formula.Counter; +import org.sonar.ce.task.projectanalysis.formula.Counter; public interface SumCounter> extends Counter { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/package-info.java new file mode 100644 index 00000000000..4e1c31eb885 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/counter/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.formula.counter; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageFormula.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/CoverageFormula.java similarity index 72% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageFormula.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/CoverageFormula.java index 28000de5e3e..4dc37f4586f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageFormula.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.formula.coverage; +package org.sonar.ce.task.projectanalysis.formula.coverage; import com.google.common.base.Optional; -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 org.sonar.ce.task.projectanalysis.formula.Counter; +import org.sonar.ce.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.ce.task.projectanalysis.formula.Formula; +import org.sonar.ce.task.projectanalysis.measure.Measure; -import static org.sonar.server.computation.task.projectanalysis.formula.coverage.CoverageUtils.calculateCoverage; -import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.formula.coverage.CoverageUtils.calculateCoverage; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; /** * An abstract {@link Formula} which implements the aggregation of a {@link Counter} of diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtils.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/CoverageUtils.java similarity index 84% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtils.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/CoverageUtils.java index 617c91d3756..7de4698807a 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtils.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/CoverageUtils.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.task.projectanalysis.formula.coverage; +package org.sonar.ce.task.projectanalysis.formula.coverage; import com.google.common.base.Optional; -import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; -import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.task.projectanalysis.measure.Measure; -import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; public final class CoverageUtils { private static final Measure DEFAULT_MEASURE = newMeasureBuilder().create(0L); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageVariationFormula.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/CoverageVariationFormula.java similarity index 72% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageVariationFormula.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/CoverageVariationFormula.java index 3c4dac115e4..b5abe339336 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageVariationFormula.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/CoverageVariationFormula.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.task.projectanalysis.formula.coverage; +package org.sonar.ce.task.projectanalysis.formula.coverage; import com.google.common.base.Optional; -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.LongValue; -import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.ce.task.projectanalysis.formula.Formula; +import org.sonar.ce.task.projectanalysis.formula.counter.LongValue; +import org.sonar.ce.task.projectanalysis.measure.Measure; -import static org.sonar.server.computation.task.projectanalysis.formula.coverage.CoverageUtils.calculateCoverage; -import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.formula.coverage.CoverageUtils.calculateCoverage; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; /** * An abstract Formula which implements the aggregation of a Counter of type ElementsAndCoveredElementsVariationCounter diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsCounter.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsCounter.java similarity index 84% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsCounter.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsCounter.java index a93903d4418..932bc8da107 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsCounter.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsCounter.java @@ -17,11 +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.task.projectanalysis.formula.coverage; +package org.sonar.ce.task.projectanalysis.formula.coverage; -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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.formula.Counter; +import org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsVariationCounter.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsVariationCounter.java similarity index 74% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsVariationCounter.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsVariationCounter.java index f25187b44ed..b070117f831 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsVariationCounter.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/ElementsAndCoveredElementsVariationCounter.java @@ -17,12 +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.task.projectanalysis.formula.coverage; +package org.sonar.ce.task.projectanalysis.formula.coverage; -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.LongValue; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.formula.Counter; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.task.projectanalysis.formula.counter.LongValue; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.formula.Counter; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.task.projectanalysis.formula.counter.LongValue; /** * A counter used to create measure variations which are based on a count of elements and coveredElements. diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredCounter.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredCounter.java similarity index 84% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredCounter.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredCounter.java index 37f4a71c22a..d2deedb642d 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredCounter.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.formula.coverage; +package org.sonar.ce.task.projectanalysis.formula.coverage; -import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; -import static org.sonar.server.computation.task.projectanalysis.formula.coverage.CoverageUtils.getLongMeasureValue; +import static org.sonar.ce.task.projectanalysis.formula.coverage.CoverageUtils.getLongMeasureValue; public final class LinesAndConditionsWithUncoveredCounter extends ElementsAndCoveredElementsCounter { private final LinesAndConditionsWithUncoveredMetricKeys metricKeys; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredFormula.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredFormula.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredFormula.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredFormula.java index 29d446c0a1c..4ab8976de24 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredFormula.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.formula.coverage; +package org.sonar.ce.task.projectanalysis.formula.coverage; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredMetricKeys.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredMetricKeys.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredMetricKeys.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredMetricKeys.java index f791348e142..14e390da80b 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredMetricKeys.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.formula.coverage; +package org.sonar.ce.task.projectanalysis.formula.coverage; import javax.annotation.concurrent.Immutable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java index a040be9eb55..83fb4ca2814 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java @@ -17,11 +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.task.projectanalysis.formula.coverage; +package org.sonar.ce.task.projectanalysis.formula.coverage; import com.google.common.base.Optional; -import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; -import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.task.projectanalysis.measure.Measure; public final class LinesAndConditionsWithUncoveredVariationCounter extends ElementsAndCoveredElementsVariationCounter { private final LinesAndConditionsWithUncoveredMetricKeys metricKeys; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationFormula.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationFormula.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationFormula.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationFormula.java index ff9a978c065..72d704d2c3e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/LinesAndConditionsWithUncoveredVariationFormula.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.formula.coverage; +package org.sonar.ce.task.projectanalysis.formula.coverage; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredCounter.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/SingleWithUncoveredCounter.java similarity index 83% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredCounter.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/SingleWithUncoveredCounter.java index 7af5018af5e..8f9fbfb9006 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredCounter.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.formula.coverage; +package org.sonar.ce.task.projectanalysis.formula.coverage; -import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; -import static org.sonar.server.computation.task.projectanalysis.formula.coverage.CoverageUtils.getLongMeasureValue; +import static org.sonar.ce.task.projectanalysis.formula.coverage.CoverageUtils.getLongMeasureValue; public final class SingleWithUncoveredCounter extends ElementsAndCoveredElementsCounter { private final SingleWithUncoveredMetricKeys metricKeys; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredFormula.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/SingleWithUncoveredFormula.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredFormula.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/SingleWithUncoveredFormula.java index e30ea4d918c..5b4975a094e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredFormula.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.formula.coverage; +package org.sonar.ce.task.projectanalysis.formula.coverage; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredMetricKeys.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/SingleWithUncoveredMetricKeys.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredMetricKeys.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/SingleWithUncoveredMetricKeys.java index 7727e70b700..b60b0ce0ff0 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredMetricKeys.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.formula.coverage; +package org.sonar.ce.task.projectanalysis.formula.coverage; import javax.annotation.concurrent.Immutable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationCounter.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationCounter.java similarity index 84% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationCounter.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationCounter.java index 29ecd2d1afb..5b64e2095fa 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationCounter.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationCounter.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.task.projectanalysis.formula.coverage; +package org.sonar.ce.task.projectanalysis.formula.coverage; -import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; import static java.util.Objects.requireNonNull; -import static org.sonar.server.computation.task.projectanalysis.formula.coverage.CoverageUtils.getMeasureVariations; +import static org.sonar.ce.task.projectanalysis.formula.coverage.CoverageUtils.getMeasureVariations; public final class SingleWithUncoveredVariationCounter extends ElementsAndCoveredElementsVariationCounter { private final SingleWithUncoveredMetricKeys metricKeys; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationFormula.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationFormula.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationFormula.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationFormula.java index 2501f462c7b..e950a6a619e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/SingleWithUncoveredVariationFormula.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.formula.coverage; +package org.sonar.ce.task.projectanalysis.formula.coverage; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/package-info.java new file mode 100644 index 00000000000..3f7d1f09f7c --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/coverage/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.formula.coverage; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/package-info.java new file mode 100644 index 00000000000..b125aff3fa5 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/formula/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.formula; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/BaseIssuesLoader.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/BaseIssuesLoader.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/BaseIssuesLoader.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/BaseIssuesLoader.java index e778c889bc7..f74569a0245 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/BaseIssuesLoader.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/BaseIssuesLoader.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Set; import org.sonar.db.DbClient; import org.sonar.db.DbSession; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; /** * Loads all the project open issues from database, including manual issues. diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitor.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitor.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitor.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitor.java index 1f6d96bac6a..2b367fa1c3d 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitor.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.List; import java.util.Set; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; import org.sonar.core.issue.DefaultIssue; -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.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; /** * Close issues on removed components diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesLoader.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ComponentIssuesLoader.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesLoader.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ComponentIssuesLoader.java index 3dd91d851a0..13bb7eabb58 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesLoader.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ComponentIssuesLoader.java @@ -17,7 +17,7 @@ * along with this program; 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.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.ArrayList; import java.util.List; @@ -29,7 +29,7 @@ import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.issue.IssueChangeDto; import org.sonar.db.issue.IssueMapper; -import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolder; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolder; import static java.util.Collections.emptyList; import static java.util.stream.Collectors.groupingBy; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ComponentIssuesRepository.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ComponentIssuesRepository.java index 5e16f37a4c6..29ba64fb3f7 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ComponentIssuesRepository.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.List; import org.sonar.api.ce.measure.MeasureComputer; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ComponentIssuesRepositoryImpl.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ComponentIssuesRepositoryImpl.java index 68dd04cc48c..55501346485 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ComponentIssuesRepositoryImpl.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.List; import javax.annotation.CheckForNull; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssues.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ComponentsWithUnprocessedIssues.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssues.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ComponentsWithUnprocessedIssues.java index fa46348508f..4409027262f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssues.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.HashSet; import java.util.Set; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculator.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/DebtCalculator.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculator.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/DebtCalculator.java index c896d0de584..bcfff807bd2 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculator.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import com.google.common.base.MoreObjects; import com.google.common.base.Strings; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssignee.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/DefaultAssignee.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssignee.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/DefaultAssignee.java index 6b0bc6a1f38..92448dca15b 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssignee.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/DefaultAssignee.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import javax.annotation.CheckForNull; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; +import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.user.UserDto; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.task.projectanalysis.component.ConfigurationRepository; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; import static com.google.common.base.Strings.isNullOrEmpty; import static org.sonar.api.CoreProperties.DEFAULT_ISSUE_ASSIGNEE; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultTrackingInput.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/DefaultTrackingInput.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultTrackingInput.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/DefaultTrackingInput.java index 69bbc1e4923..d49dac53627 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultTrackingInput.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/DefaultTrackingInput.java @@ -17,7 +17,7 @@ * along with this program; 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.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Collection; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregator.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/EffortAggregator.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregator.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/EffortAggregator.java index 7dd3fe00c8a..51e4c20d02a 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregator.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/EffortAggregator.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.HashMap; import java.util.Map; import org.sonar.api.measures.CoreMetrics; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; -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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitor.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IntegrateIssuesVisitor.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitor.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IntegrateIssuesVisitor.java index 57b2e72491e..af09f83a34c 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitor.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IntegrateIssuesVisitor.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.MergeBranchComponentUuids; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; import org.sonar.core.issue.DefaultIssue; -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.MergeBranchComponentUuids; -import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; import org.sonar.server.util.cache.DiskCache; -import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; public class IntegrateIssuesVisitor extends TypeAwareVisitorAdapter { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssigner.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueAssigner.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssigner.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueAssigner.java index 8f12d42bea8..f5a15561578 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssigner.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueAssigner.java @@ -17,20 +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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Date; import java.util.Optional; import javax.annotation.CheckForNull; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.IssueChangeContext; import org.sonar.db.issue.IssueDto; -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.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.scm.ScmInfo; +import org.sonar.ce.task.projectanalysis.scm.ScmInfoRepository; import org.sonar.server.issue.IssueFieldsSetter; import static com.google.common.base.Strings.isNullOrEmpty; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCache.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueCache.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCache.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueCache.java index 2eadad16318..6236da6938a 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCache.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.io.File; import org.sonar.api.utils.System2; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounter.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueCounter.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounter.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueCounter.java index a5a698a70ce..56b777e762e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounter.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import com.google.common.collect.EnumMultiset; import com.google.common.collect.HashMultiset; @@ -28,14 +28,15 @@ import java.util.Map; import javax.annotation.Nullable; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rules.RuleType; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; -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.period.Period; -import org.sonar.server.computation.task.projectanalysis.period.PeriodHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolder; 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCreationDateCalculator.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueCreationDateCalculator.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCreationDateCalculator.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueCreationDateCalculator.java index 774fc503ad7..64816ce6b2a 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCreationDateCalculator.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueCreationDateCalculator.java @@ -17,7 +17,7 @@ * along with this program; 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.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Comparator; import java.util.Date; @@ -30,21 +30,22 @@ import java.util.stream.IntStream; import javax.annotation.Nullable; import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.DateUtils; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.IssueChangeContext; import org.sonar.db.protobuf.DbCommons.TextRange; import org.sonar.db.protobuf.DbIssues; import org.sonar.db.protobuf.DbIssues.Flow; import org.sonar.db.protobuf.DbIssues.Location; -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.ScannerPlugin; -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 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.ce.task.projectanalysis.analysis.Analysis; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.ScannerPlugin; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolder; +import org.sonar.ce.task.projectanalysis.scm.Changeset; +import org.sonar.ce.task.projectanalysis.scm.ScmInfo; +import org.sonar.ce.task.projectanalysis.scm.ScmInfoRepository; import org.sonar.server.issue.IssueFieldsSetter; import static org.sonar.core.issue.IssueChangeContext.createScan; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycle.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueLifecycle.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycle.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueLifecycle.java index 3bd8525c146..52855f4234b 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycle.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import com.google.common.annotations.VisibleForTesting; import java.util.Date; @@ -28,7 +28,7 @@ import org.sonar.core.issue.DefaultIssueComment; import org.sonar.core.issue.FieldDiffs; import org.sonar.core.issue.IssueChangeContext; import org.sonar.core.util.Uuids; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; import org.sonar.server.issue.IssueFieldsSetter; import org.sonar.server.issue.workflow.IssueWorkflow; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueTrackingDelegator.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueTrackingDelegator.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueTrackingDelegator.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueTrackingDelegator.java index c60c9abade4..189d239a39e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueTrackingDelegator.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueTrackingDelegator.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.tracking.Tracking; import org.sonar.db.component.BranchType; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.component.Component; import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitor.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueVisitor.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitor.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueVisitor.java index d974dc76eea..ddfc3567300 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitor.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueVisitor.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; public abstract class IssueVisitor { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitors.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueVisitors.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitors.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueVisitors.java index 8a9d1ecb6f9..ac730077577 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssueVisitors.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueVisitors.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; public class IssueVisitors { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssuesRepositoryVisitor.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssuesRepositoryVisitor.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssuesRepositoryVisitor.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssuesRepositoryVisitor.java index 7aa61769a86..2a5f3f2db45 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/IssuesRepositoryVisitor.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssuesRepositoryVisitor.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.ArrayList; import java.util.List; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; /** * Saves issues in the ComponentIssuesRepository diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitor.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitor.java similarity index 79% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitor.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitor.java index ad7d18c8191..b47306f1686 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitor.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; -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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; -import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; /** * Load all open components having open issues of the project diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MergeBranchTrackerExecution.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/MergeBranchTrackerExecution.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MergeBranchTrackerExecution.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/MergeBranchTrackerExecution.java index d1ad122a2e6..745e79c8ea9 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MergeBranchTrackerExecution.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/MergeBranchTrackerExecution.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; +import org.sonar.ce.task.projectanalysis.component.Component; 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.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; public class MergeBranchTrackerExecution { private final TrackerRawInputFactory rawInputFactory; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitor.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/MovedIssueVisitor.java similarity index 87% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitor.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/MovedIssueVisitor.java index c73ed51304e..3ebe858b77f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitor.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/MovedIssueVisitor.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import com.google.common.base.Optional; import java.util.Date; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.IssueChangeContext; -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.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.filemove.MovedFilesRepository; +import org.sonar.ce.task.projectanalysis.filemove.MovedFilesRepository.OriginalFile; import org.sonar.server.issue.IssueFieldsSetter; import static com.google.common.base.Preconditions.checkState; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MutableComponentIssuesRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/MutableComponentIssuesRepository.java similarity index 87% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MutableComponentIssuesRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/MutableComponentIssuesRepository.java index ce483ab76ad..e719ef97b8d 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/MutableComponentIssuesRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/MutableComponentIssuesRepository.java @@ -17,11 +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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.List; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; public interface MutableComponentIssuesRepository extends ComponentIssuesRepository { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregator.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/NewEffortAggregator.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregator.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/NewEffortAggregator.java index e19dd5f851e..a9e3c2e3c93 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregator.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/NewEffortAggregator.java @@ -17,20 +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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import com.google.common.base.MoreObjects; import java.util.HashMap; import java.util.Map; import org.sonar.api.measures.CoreMetrics; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; -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.period.Period; -import org.sonar.server.computation.task.projectanalysis.period.PeriodHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolder; 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RemoveProcessedComponentsVisitor.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/RemoveProcessedComponentsVisitor.java similarity index 87% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RemoveProcessedComponentsVisitor.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/RemoveProcessedComponentsVisitor.java index b0caa024820..3b5aef27017 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RemoveProcessedComponentsVisitor.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/RemoveProcessedComponentsVisitor.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; -import org.sonar.server.computation.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.filemove.MovedFilesRepository; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.filemove.MovedFilesRepository; import com.google.common.base.Optional; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/Rule.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/Rule.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/Rule.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/Rule.java index f5225d5f1db..6cba8ab28e4 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/Rule.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Set; import javax.annotation.CheckForNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/RuleImpl.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/RuleImpl.java index 13e42188b9b..43b0d294995 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import com.google.common.base.MoreObjects; import java.util.Set; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/RuleRepository.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/RuleRepository.java index 1831b74b8a1..123dc51d93c 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Optional; import java.util.function.Supplier; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/RuleRepositoryImpl.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/RuleRepositoryImpl.java index 1c3f13cf700..65be96fdfa7 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import com.google.common.collect.Multimap; import java.util.Collections; @@ -36,7 +36,7 @@ import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.rule.DeprecatedRuleKeyDto; import org.sonar.db.rule.RuleDto; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; import org.sonar.server.rule.ExternalRuleCreator; import org.sonar.server.rule.NewExternalRule; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopier.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/RuleTagsCopier.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopier.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/RuleTagsCopier.java index 2f6d220b7a0..d8b4815ae8d 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopier.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/RuleTagsCopier.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; import static com.google.common.collect.Sets.union; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopier.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/RuleTypeCopier.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopier.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/RuleTypeCopier.java index 040c88edf97..7a6fddb6d72 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopier.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/RuleTypeCopier.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; public class RuleTypeCopier extends IssueVisitor { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUser.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ScmAccountToUser.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUser.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ScmAccountToUser.java index 0a29651d927..a1f63ecf0c4 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUser.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import org.sonar.server.util.cache.MemoryCache; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoader.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ScmAccountToUserLoader.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoader.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ScmAccountToUserLoader.java index 8b423bdc0c6..95b32cff881 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoader.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import com.google.common.base.Joiner; import com.google.common.collect.Ordering; @@ -27,7 +27,7 @@ import java.util.Map; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.core.util.stream.MoreCollectors; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; import org.sonar.server.user.index.UserDoc; import org.sonar.server.user.index.UserIndex; import org.sonar.server.util.cache.CacheLoader; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ShortBranchIssue.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ShortBranchIssue.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ShortBranchIssue.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ShortBranchIssue.java index 1bf83ebf0db..860afbe6d8f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ShortBranchIssue.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ShortBranchIssue.java @@ -17,7 +17,7 @@ * along with this program; 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.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Date; import javax.annotation.CheckForNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ShortBranchIssueMerger.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ShortBranchIssueMerger.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ShortBranchIssueMerger.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ShortBranchIssueMerger.java index 73d376e9c45..dd77cd645e6 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ShortBranchIssueMerger.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ShortBranchIssueMerger.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Collection; import java.util.Map; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.tracking.SimpleTracker; import org.sonar.core.issue.tracking.Tracking; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; public class ShortBranchIssueMerger { private final ShortBranchIssuesLoader shortBranchIssuesLoader; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ShortBranchIssuesLoader.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ShortBranchIssuesLoader.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ShortBranchIssuesLoader.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ShortBranchIssuesLoader.java index 4d86d87b61e..a75f1608c74 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ShortBranchIssuesLoader.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ShortBranchIssuesLoader.java @@ -17,7 +17,7 @@ * along with this program; 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.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Collection; import java.util.Collections; @@ -25,6 +25,8 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ShortBranchComponentsWithIssues; import org.sonar.core.issue.DefaultIssue; import org.sonar.db.DbClient; import org.sonar.db.DbSession; @@ -32,8 +34,8 @@ import org.sonar.db.component.ComponentDto; import org.sonar.db.issue.IssueChangeDto; import org.sonar.db.issue.IssueDto; import org.sonar.db.issue.ShortBranchIssueDto; -import org.sonar.server.computation.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.component.ShortBranchComponentsWithIssues; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ShortBranchComponentsWithIssues; import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.toMap; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ShortBranchTrackerExecution.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ShortBranchTrackerExecution.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ShortBranchTrackerExecution.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ShortBranchTrackerExecution.java index 0dc4cc62fc1..af321c0de39 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/ShortBranchTrackerExecution.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/ShortBranchTrackerExecution.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.ArrayList; import java.util.List; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.tracking.Input; import org.sonar.core.issue.tracking.Tracker; import org.sonar.core.issue.tracking.Tracking; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; public class ShortBranchTrackerExecution { private final TrackerBaseInputFactory baseInputFactory; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactory.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackerBaseInputFactory.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactory.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackerBaseInputFactory.java index c582a49302b..0ba69ce041f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactory.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackerBaseInputFactory.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Collections; import java.util.List; import javax.annotation.CheckForNull; import javax.annotation.Nullable; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.tracking.Input; import org.sonar.core.issue.tracking.LazyInput; import org.sonar.core.issue.tracking.LineHashSequence; import org.sonar.db.DbClient; import org.sonar.db.DbSession; -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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.filemove.MovedFilesRepository; +import org.sonar.ce.task.projectanalysis.filemove.MovedFilesRepository.OriginalFile; /** * Factory of {@link Input} of base data for issue tracking. Data are lazy-loaded. diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerExecution.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackerExecution.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerExecution.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackerExecution.java index 071e37af263..deb980b43d6 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerExecution.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackerExecution.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; +import org.sonar.ce.task.projectanalysis.component.Component; 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.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; public class TrackerExecution { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerMergeBranchInputFactory.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackerMergeBranchInputFactory.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerMergeBranchInputFactory.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackerMergeBranchInputFactory.java index d28a5ea13b0..8334e26a69f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerMergeBranchInputFactory.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackerMergeBranchInputFactory.java @@ -17,19 +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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Collections; import java.util.List; import javax.annotation.Nullable; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.MergeBranchComponentUuids; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.tracking.Input; import org.sonar.core.issue.tracking.LazyInput; import org.sonar.core.issue.tracking.LineHashSequence; import org.sonar.db.DbClient; import org.sonar.db.DbSession; -import org.sonar.server.computation.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.component.MergeBranchComponentUuids; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.MergeBranchComponentUuids; public class TrackerMergeBranchInputFactory { private static final LineHashSequence EMPTY_LINE_HASH_SEQUENCE = new LineHashSequence(Collections.emptyList()); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactory.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackerRawInputFactory.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactory.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackerRawInputFactory.java index d3e9d2f157a..97243a5ab87 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactory.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.ArrayList; import java.util.Collections; @@ -28,6 +28,7 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rules.RuleType; import org.sonar.api.utils.Duration; import org.sonar.api.utils.log.Loggers; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.tracking.Input; import org.sonar.core.issue.tracking.LazyInput; @@ -38,13 +39,13 @@ import org.sonar.db.protobuf.DbIssues; import org.sonar.scanner.protocol.Constants.Severity; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.IssueType; -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.qualityprofile.ActiveRulesHolder; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesHashRepository; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.issue.commonrule.CommonRuleEngine; +import org.sonar.ce.task.projectanalysis.issue.filter.IssueFilter; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolder; +import org.sonar.ce.task.projectanalysis.source.SourceLinesHashRepository; import org.sonar.server.rule.CommonRuleKeys; import org.sonar.server.rule.NewExternalRule; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackingResult.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackingResult.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackingResult.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackingResult.java index 5cb93368c2c..10141e9a186 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackingResult.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackingResult.java @@ -17,7 +17,7 @@ * along with this program; 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.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Map; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolver.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/UpdateConflictResolver.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolver.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/UpdateConflictResolver.java index 69af6f4b18b..2096da159da 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolver.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import com.google.common.annotations.VisibleForTesting; import org.sonar.api.utils.log.Logger; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/AbstractCoverageRule.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/AbstractCoverageRule.java similarity index 84% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/AbstractCoverageRule.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/AbstractCoverageRule.java index b78a399aa0f..af2195200eb 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/AbstractCoverageRule.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/AbstractCoverageRule.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.task.projectanalysis.issue.commonrule; +package org.sonar.ce.task.projectanalysis.issue.commonrule; import com.google.common.base.Optional; -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; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolder; public abstract class AbstractCoverageRule extends CommonRule { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRule.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/BranchCoverageRule.java similarity index 84% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRule.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/BranchCoverageRule.java index 9f9364151a6..ffb78f8d300 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRule.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.issue.commonrule; +package org.sonar.ce.task.projectanalysis.issue.commonrule; import org.sonar.api.measures.CoreMetrics; -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.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolder; import org.sonar.server.rule.CommonRuleKeys; import static java.lang.String.format; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRule.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CommentDensityRule.java similarity index 86% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRule.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CommentDensityRule.java index 8f41a6e63da..6d257e2dfb1 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRule.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CommentDensityRule.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.task.projectanalysis.issue.commonrule; +package org.sonar.ce.task.projectanalysis.issue.commonrule; import com.google.common.base.Optional; import org.sonar.api.measures.CoreMetrics; -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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolder; import org.sonar.server.rule.CommonRuleKeys; import static java.lang.String.format; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRule.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CommonRule.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRule.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CommonRule.java index 397f9305355..89dd4af6d91 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRule.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CommonRule.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.task.projectanalysis.issue.commonrule; +package org.sonar.ce.task.projectanalysis.issue.commonrule; import com.google.common.base.Optional; import javax.annotation.CheckForNull; import org.sonar.api.rule.RuleKey; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; -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 org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngine.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CommonRuleEngine.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngine.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CommonRuleEngine.java index 7c29e97a81f..e783201f87d 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngine.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CommonRuleEngine.java @@ -17,11 +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.task.projectanalysis.issue.commonrule; +package org.sonar.ce.task.projectanalysis.issue.commonrule; import java.util.Collection; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; /** * Generate the issues related to "common rules", which are diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CommonRuleEngineImpl.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CommonRuleEngineImpl.java index 71da0a63970..892d8b9c856 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CommonRuleEngineImpl.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.task.projectanalysis.issue.commonrule; +package org.sonar.ce.task.projectanalysis.issue.commonrule; import java.util.ArrayList; import java.util.Collection; import javax.annotation.CheckForNull; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; public class CommonRuleEngineImpl implements CommonRuleEngine { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRule.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/DuplicatedBlockRule.java similarity index 76% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRule.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/DuplicatedBlockRule.java index 9d7b7fbabe2..58c46a52b81 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRule.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/DuplicatedBlockRule.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.task.projectanalysis.issue.commonrule; +package org.sonar.ce.task.projectanalysis.issue.commonrule; import com.google.common.base.Optional; import org.sonar.api.measures.CoreMetrics; -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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolder; import org.sonar.server.rule.CommonRuleKeys; import static java.lang.String.format; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRule.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/LineCoverageRule.java similarity index 84% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRule.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/LineCoverageRule.java index cbb761aa09f..df5d4f23cfc 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRule.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.issue.commonrule; +package org.sonar.ce.task.projectanalysis.issue.commonrule; import org.sonar.api.measures.CoreMetrics; -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.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolder; import org.sonar.server.rule.CommonRuleKeys; import static java.lang.String.format; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRule.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/SkippedTestRule.java similarity index 75% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRule.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/SkippedTestRule.java index 823141076f1..439c6c99662 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRule.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/SkippedTestRule.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.task.projectanalysis.issue.commonrule; +package org.sonar.ce.task.projectanalysis.issue.commonrule; import com.google.common.base.Optional; import org.sonar.api.measures.CoreMetrics; -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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolder; import org.sonar.server.rule.CommonRuleKeys; import static java.lang.String.format; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRule.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/TestErrorRule.java similarity index 78% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRule.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/TestErrorRule.java index a0e619ae2dc..7c7df1deec3 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRule.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/TestErrorRule.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.task.projectanalysis.issue.commonrule; +package org.sonar.ce.task.projectanalysis.issue.commonrule; import com.google.common.base.Optional; import org.sonar.api.measures.CoreMetrics; -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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolder; import org.sonar.server.rule.CommonRuleKeys; import static java.lang.String.format; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/package-info.java new file mode 100644 index 00000000000..234c8f413dd --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/commonrule/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.issue.commonrule; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilter.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/filter/IssueFilter.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilter.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/filter/IssueFilter.java index 5ef0684a412..64e7951aea8 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilter.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.issue.filter; +package org.sonar.ce.task.projectanalysis.issue.filter; import com.google.common.base.Splitter; import java.util.ArrayList; @@ -27,18 +27,18 @@ import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.config.Configuration; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.component.ConfigurationRepository; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Strings.isNullOrEmpty; import static java.lang.String.format; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; import static org.sonar.core.config.IssueExclusionProperties.PATTERNS_MULTICRITERIA_EXCLUSION_KEY; 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.task.projectanalysis.component.Component.Type.FILE; @ComputeEngineSide public class IssueFilter { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePattern.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/filter/IssuePattern.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePattern.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/filter/IssuePattern.java index e1b15d787a9..8b97dc8c252 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePattern.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/filter/IssuePattern.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.task.projectanalysis.issue.filter; +package org.sonar.ce.task.projectanalysis.issue.filter; import javax.annotation.Nullable; import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.WildcardPattern; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; public class IssuePattern { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/filter/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/filter/package-info.java new file mode 100644 index 00000000000..853b40f5c92 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/filter/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.issue.filter; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/package-info.java new file mode 100644 index 00000000000..3c52604e5dc --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.issue; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/language/LanguageRepository.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/language/LanguageRepository.java index d6aa87e6480..53b7f73b3b5 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.language; +package org.sonar.ce.task.projectanalysis.language; import com.google.common.base.Optional; import org.sonar.api.resources.Language; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/language/LanguageRepositoryImpl.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/language/LanguageRepositoryImpl.java index 00090b04c6f..04654f373c3 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.language; +package org.sonar.ce.task.projectanalysis.language; import com.google.common.base.Function; import com.google.common.base.Optional; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/language/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/language/package-info.java new file mode 100644 index 00000000000..415a95aef49 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/language/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.language; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasure.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/BatchMeasureToMeasure.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasure.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/BatchMeasureToMeasure.java index fd1134f8456..782a0ae4eac 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasure.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import com.google.common.base.Optional; import java.util.Objects; import javax.annotation.Nullable; +import org.sonar.ce.task.projectanalysis.metric.Metric; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.Measure.ValueCase; -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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimization.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/BestValueOptimization.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimization.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/BestValueOptimization.java index 3d352219c14..5084ccf1e19 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimization.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/BestValueOptimization.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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import java.util.function.Predicate; import javax.annotation.Nonnull; -import org.sonar.server.computation.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.metric.Metric; import static java.util.Objects.requireNonNull; import static org.apache.commons.lang.math.NumberUtils.compare; -import static org.sonar.server.computation.task.projectanalysis.measure.Measure.ValueType.NO_VALUE; +import static org.sonar.ce.task.projectanalysis.measure.Measure.ValueType.NO_VALUE; public class BestValueOptimization implements Predicate { private final Metric metric; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/LiveMeasureDtoToMeasure.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/LiveMeasureDtoToMeasure.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/LiveMeasureDtoToMeasure.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/LiveMeasureDtoToMeasure.java index ec06d95627d..8eb3f96a3c7 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/LiveMeasureDtoToMeasure.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/LiveMeasureDtoToMeasure.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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import com.google.common.base.Optional; import javax.annotation.Nullable; +import org.sonar.ce.task.projectanalysis.metric.Metric; import org.sonar.db.measure.LiveMeasureDto; -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.task.projectanalysis.measure.Measure.Level.toLevel; +import static org.sonar.ce.task.projectanalysis.measure.Measure.Level.toLevel; public class LiveMeasureDtoToMeasure { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MapBasedRawMeasureRepository.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MapBasedRawMeasureRepository.java index cc9c4878c62..bed4573b235 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -30,8 +30,10 @@ import java.util.Map; import java.util.Set; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.sonar.server.computation.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/Measure.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/Measure.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/Measure.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/Measure.java index 8f1c8eaee89..09c0b76734c 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/Measure.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import com.google.common.base.Optional; import java.math.BigDecimal; @@ -26,7 +26,8 @@ import java.util.Locale; import java.util.Objects; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import org.sonar.server.computation.task.projectanalysis.component.Developer; +import org.sonar.ce.task.projectanalysis.component.Developer; +import org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureComputersHolder.java similarity index 83% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolder.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureComputersHolder.java index 1335984d7cc..e6bd95ae8c7 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureComputersHolder.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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; -import org.sonar.server.computation.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; +import org.sonar.ce.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; +import org.sonar.ce.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; public interface MeasureComputersHolder { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureComputersHolderImpl.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureComputersHolderImpl.java index 3506f406b96..2ad04b1a27b 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureComputersHolderImpl.java @@ -17,11 +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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import com.google.common.base.Predicates; import javax.annotation.CheckForNull; -import org.sonar.server.computation.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; +import org.sonar.ce.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; +import org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersVisitor.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureComputersVisitor.java similarity index 69% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersVisitor.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureComputersVisitor.java index 6b89de5a982..e2a527d7efa 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersVisitor.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.measure; +package org.sonar.ce.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.task.projectanalysis.component.CrawlerDepthLimit; -import org.sonar.server.computation.task.projectanalysis.component.ConfigurationRepository; -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 org.sonar.ce.task.projectanalysis.api.measurecomputer.MeasureComputerContextImpl; +import org.sonar.ce.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; +import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.issue.ComponentIssuesRepository; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; -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; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.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.task.projectanalysis.component.Component component) { + public void visitAny(org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasure.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureDtoToMeasure.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasure.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureDtoToMeasure.java index 490655294c9..7bd3094e2b5 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasure.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import com.google.common.base.Optional; import javax.annotation.Nullable; +import org.sonar.ce.task.projectanalysis.metric.Metric; import org.sonar.db.measure.MeasureDto; -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.task.projectanalysis.measure.Measure.Level.toLevel; +import static org.sonar.ce.task.projectanalysis.measure.Measure.Level.toLevel; public class MeasureDtoToMeasure { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKey.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureKey.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKey.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureKey.java index 060fc06391e..92f66668dc5 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKey.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureKey.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.task.projectanalysis.measure; +package org.sonar.ce.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.task.projectanalysis.component.Developer; +import org.sonar.ce.task.projectanalysis.component.Developer; +import org.sonar.ce.task.projectanalysis.component.Developer; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepository.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepository.java index ccfe7e8bf1c..97bb0a1cf33 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepository.java @@ -17,14 +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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import com.google.common.base.Optional; import com.google.common.collect.SetMultimap; import java.util.Set; -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; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricImpl; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricImpl; public interface MeasureRepository { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImpl.java similarity index 87% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImpl.java index c9454688e38..f83f96ee94c 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImpl.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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import com.google.common.base.Optional; import com.google.common.collect.SetMultimap; import java.util.HashSet; import java.util.Set; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.measure.MapBasedRawMeasureRepository.OverridePolicy; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.metric.ReportMetricValidator; import org.sonar.core.util.CloseableIterator; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.measure.MeasureDto; import org.sonar.scanner.protocol.output.ScannerReport; -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.task.projectanalysis.component.ComponentFunctions.toReportRef; +import static org.sonar.ce.task.projectanalysis.component.ComponentFunctions.toReportRef; public class MeasureRepositoryImpl implements MeasureRepository { private final MapBasedRawMeasureRepository delegate = new MapBasedRawMeasureRepository<>(toReportRef()); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDto.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureToMeasureDto.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDto.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureToMeasureDto.java index 7602af9667e..ead6946a36e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDto.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureToMeasureDto.java @@ -17,15 +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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import javax.annotation.CheckForNull; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.metric.Metric; import org.sonar.db.measure.LiveMeasureDto; import org.sonar.db.measure.MeasureDto; -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.metric.Metric; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.metric.Metric; public class MeasureToMeasureDto { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MutableMeasureComputersHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MutableMeasureComputersHolder.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MutableMeasureComputersHolder.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MutableMeasureComputersHolder.java index 8ada4fc038f..80b4458037c 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/MutableMeasureComputersHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MutableMeasureComputersHolder.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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; -import org.sonar.server.computation.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; +import org.sonar.ce.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; +import org.sonar.ce.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; /** * A {@link MeasureComputersHolder} which value can be set only once. diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/PostMeasuresComputationCheck.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/PostMeasuresComputationCheck.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/PostMeasuresComputationCheck.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/PostMeasuresComputationCheck.java index 967778694b7..6262ba88030 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/PostMeasuresComputationCheck.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/PostMeasuresComputationCheck.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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import org.sonar.api.ExtensionPoint; import org.sonar.api.ce.ComputeEngineSide; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; /** * Extension point that is called during processing of a task diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/PostMeasuresComputationChecksStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/PostMeasuresComputationChecksStep.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/PostMeasuresComputationChecksStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/PostMeasuresComputationChecksStep.java index b03e3e39ba1..ec788322725 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/PostMeasuresComputationChecksStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/PostMeasuresComputationChecksStep.java @@ -17,15 +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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import com.google.common.base.Optional; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; -import org.sonar.server.computation.task.projectanalysis.metric.Metric; -import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.server.computation.task.step.ComputationStep; /** diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatus.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/QualityGateStatus.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatus.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/QualityGateStatus.java index ecbdcafa6fd..7d843440733 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatus.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import com.google.common.base.MoreObjects; import javax.annotation.CheckForNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/package-info.java new file mode 100644 index 00000000000..85f872340e9 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.measure; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedCondition.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/qualitygatedetails/EvaluatedCondition.java similarity index 83% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedCondition.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/qualitygatedetails/EvaluatedCondition.java index 0bdc556cc71..81052364e23 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedCondition.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/qualitygatedetails/EvaluatedCondition.java @@ -17,12 +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.task.projectanalysis.measure.qualitygatedetails; +package org.sonar.ce.task.projectanalysis.measure.qualitygatedetails; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; -import org.sonar.server.computation.task.projectanalysis.measure.Measure; -import org.sonar.server.computation.task.projectanalysis.qualitygate.Condition; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.qualitygate.Condition; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.qualitygate.Condition; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsData.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsData.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsData.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsData.java index cc84a58ee4f..a4e4d9c94fc 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsData.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsData.java @@ -17,14 +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.task.projectanalysis.measure.qualitygatedetails; +package org.sonar.ce.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.task.projectanalysis.measure.Measure; -import org.sonar.server.computation.task.projectanalysis.qualitygate.Condition; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.qualitygate.Condition; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.qualitygate.Condition; import static com.google.common.collect.FluentIterable.from; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/qualitygatedetails/package-info.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/package-info.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/qualitygatedetails/package-info.java index d103b56c85a..18161d68473 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/analysis/package-info.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/qualitygatedetails/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.computation.task.projectanalysis.analysis; +package org.sonar.ce.task.projectanalysis.measure.qualitygatedetails; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/Metric.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/Metric.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/Metric.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/Metric.java index c69971dfbdd..fbe107ccb97 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/Metric.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.metric; +package org.sonar.ce.task.projectanalysis.metric; import javax.annotation.CheckForNull; -import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.ce.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.task.projectanalysis.measure.Measure.ValueType} + * @throws IllegalStateException if the value type is not decimal (see {@link org.sonar.ce.task.projectanalysis.measure.Measure.ValueType} */ int getDecimalScale(); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetric.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/MetricDtoToMetric.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetric.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/MetricDtoToMetric.java index b654ec7cd3a..a49e0065d6b 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetric.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.metric; +package org.sonar.ce.task.projectanalysis.metric; import com.google.common.base.Function; import javax.annotation.Nonnull; import org.sonar.db.metric.MetricDto; -import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.Measure; import static com.google.common.base.MoreObjects.firstNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/MetricImpl.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/MetricImpl.java index c0ae3c05a43..693d7d528ec 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/MetricImpl.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.task.projectanalysis.metric; +package org.sonar.ce.task.projectanalysis.metric; import java.util.Objects; import javax.annotation.CheckForNull; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; -import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.Measure; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricModule.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/MetricModule.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricModule.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/MetricModule.java index 469e739fc3c..8416030af55 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricModule.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.metric; +package org.sonar.ce.task.projectanalysis.metric; import org.sonar.core.metric.ScannerMetrics; import org.sonar.core.platform.Module; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/MetricRepository.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/MetricRepository.java index 82bb2c59c06..7bad41a8a09 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.metric; +package org.sonar.ce.task.projectanalysis.metric; import java.util.Optional; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/MetricRepositoryImpl.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/MetricRepositoryImpl.java index 7681af1d1a2..fccaa0db268 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.metric; +package org.sonar.ce.task.projectanalysis.metric; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidator.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/ReportMetricValidator.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidator.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/ReportMetricValidator.java index 8c46eddfade..42ad0937ef2 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidator.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.metric; +package org.sonar.ce.task.projectanalysis.metric; /** * Validate metric to know if it can be read from the batch diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/ReportMetricValidatorImpl.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/ReportMetricValidatorImpl.java index 45973744c08..42cd1187779 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.metric; +package org.sonar.ce.task.projectanalysis.metric; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/package-info.java new file mode 100644 index 00000000000..8abb1ea0667 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/metric/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.metric; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/package-info.java new file mode 100644 index 00000000000..908ed6991b5 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/period/Period.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/period/Period.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/period/Period.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/period/Period.java index 471783cc2ec..05cba84bc9e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/period/Period.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.period; +package org.sonar.ce.task.projectanalysis.period; import java.util.Objects; import javax.annotation.CheckForNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/period/PeriodHolder.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolder.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/period/PeriodHolder.java index 788d4be373d..937d8ce874d 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/period/PeriodHolder.java @@ -17,7 +17,7 @@ * along with this program; 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.period; +package org.sonar.ce.task.projectanalysis.period; /** * Repository of period used to compute differential measures. diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/period/PeriodHolderImpl.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/period/PeriodHolderImpl.java index 31db5a518aa..f2de306664e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/period/PeriodHolderImpl.java @@ -17,7 +17,7 @@ * along with this program; 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.period; +package org.sonar.ce.task.projectanalysis.period; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/period/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/period/package-info.java new file mode 100644 index 00000000000..4920e01e72d --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/period/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.period; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/Condition.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/Condition.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/Condition.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/Condition.java index d4bccd0c04d..f5a3523a47c 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/Condition.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/Condition.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.task.projectanalysis.qualitygate; +package org.sonar.ce.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.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.Metric; import static java.util.Objects.hash; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluator.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/ConditionEvaluator.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluator.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/ConditionEvaluator.java index 4365fcafea3..6758472f118 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluator.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/ConditionEvaluator.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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import java.util.Optional; import javax.annotation.CheckForNull; import org.apache.commons.lang.StringUtils; -import org.sonar.server.computation.task.projectanalysis.measure.Measure; -import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.metric.Metric; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Optional.of; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatus.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/ConditionStatus.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatus.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/ConditionStatus.java index a404436bece..f80c91134d4 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatus.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResult.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/EvaluationResult.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResult.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/EvaluationResult.java index 5810c6607c3..e3a01b95c79 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResult.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.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.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.Measure; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverter.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/EvaluationResultTextConverter.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverter.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/EvaluationResultTextConverter.java index 9986b40aaa0..a5169be14d4 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverter.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import javax.annotation.CheckForNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/EvaluationResultTextConverterImpl.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/EvaluationResultTextConverterImpl.java index 5efad71bcb8..126609e873a 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import com.google.common.collect.ImmutableMap; import java.util.Locale; @@ -27,14 +27,16 @@ import org.sonar.api.i18n.I18n; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.Duration; import org.sonar.api.utils.Durations; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.period.Period; import org.sonar.core.timemachine.Periods; -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.PeriodHolder; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolder; import static java.util.Objects.requireNonNull; -import static org.sonar.server.computation.task.projectanalysis.measure.Measure.Level.ERROR; +import static org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/MutableQualityGateHolder.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolder.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/MutableQualityGateHolder.java index 06f366cbb04..65f2c0dda43 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/MutableQualityGateHolder.java @@ -17,7 +17,7 @@ * along with this program; 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.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import org.sonar.server.qualitygate.EvaluatedQualityGate; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/MutableQualityGateStatusHolder.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolder.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/MutableQualityGateStatusHolder.java index ead5ba2c3af..4013e737c37 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import java.util.Map; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGate.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGate.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGate.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGate.java index 484d6eda50c..127fd76e5f0 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGate.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import java.util.Objects; import java.util.Set; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateHolder.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolder.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateHolder.java index ab4087034d4..28080434fe9 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import java.util.Optional; import org.sonar.server.qualitygate.EvaluatedQualityGate; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateHolderImpl.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateHolderImpl.java index ca83ac5eff5..20132edab82 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import java.util.Optional; import org.sonar.server.qualitygate.EvaluatedQualityGate; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateService.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateService.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateService.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateService.java index 580c4d58c27..1f13b1e6d41 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateService.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateService.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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import java.util.Optional; -import org.sonar.server.computation.task.projectanalysis.analysis.Organization; +import org.sonar.ce.task.projectanalysis.analysis.Organization; public interface QualityGateService { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateServiceImpl.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateServiceImpl.java index bb4a3e0a36a..eea50dbd0b3 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateServiceImpl.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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import java.util.Collection; import java.util.Objects; import java.util.Optional; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.qualitygate.QualityGateConditionDto; import org.sonar.db.qualitygate.QualityGateDto; -import org.sonar.server.computation.task.projectanalysis.analysis.Organization; -import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.analysis.Organization; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.server.qualitygate.ShortLivingBranchQualityGate; import static org.sonar.core.util.stream.MoreCollectors.toList; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatus.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateStatus.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatus.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateStatus.java index 6e7748b7531..135d2874c32 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatus.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; public enum QualityGateStatus { OK, WARN, ERROR diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateStatusHolder.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolder.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateStatusHolder.java index ba51cb8e40e..044a6748bae 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import java.util.Map; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateStatusHolderImpl.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateStatusHolderImpl.java index 155d549d9ea..2dca40c5abf 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import com.google.common.collect.ImmutableMap; import java.util.Map; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/package-info.java new file mode 100644 index 00000000000..2847ef564c2 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitygate/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.qualitygate; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitor.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitor.java similarity index 87% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitor.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitor.java index ae5deada236..fc1f27f4ed3 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitor.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitor.java @@ -17,18 +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.task.projectanalysis.qualitymodel; +package org.sonar.ce.task.projectanalysis.qualitymodel; import com.google.common.base.Optional; import org.sonar.api.measures.CoreMetrics; -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.RatingValue; -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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.PathAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.PathAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.formula.counter.RatingValue; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.server.measure.Rating; import static org.sonar.api.measures.CoreMetrics.DEVELOPMENT_COST_KEY; @@ -37,8 +41,8 @@ import static org.sonar.api.measures.CoreMetrics.NCLOC_KEY; import static org.sonar.api.measures.CoreMetrics.SQALE_DEBT_RATIO_KEY; import static org.sonar.api.measures.CoreMetrics.SQALE_RATING_KEY; import static org.sonar.api.measures.CoreMetrics.TECHNICAL_DEBT_KEY; -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.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; /** * Compute measures related to maintainability for projects and descendants : @@ -60,7 +64,7 @@ public class MaintainabilityMeasuresVisitor extends PathAwareVisitorAdapter

metricsByKey; public ReliabilityAndSecurityRatingMeasuresVisitor(MetricRepository metricRepository, MeasureRepository measureRepository, ComponentIssuesRepository componentIssuesRepository) { - super(FILE, POST_ORDER, CounterFactory.INSTANCE); + super(FILE, Order.POST_ORDER, CounterFactory.INSTANCE); this.measureRepository = measureRepository; this.componentIssuesRepository = componentIssuesRepository; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitymodel/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitymodel/package-info.java new file mode 100644 index 00000000000..ffe07bf1cea --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualitymodel/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.qualitymodel; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRule.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualityprofile/ActiveRule.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRule.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualityprofile/ActiveRule.java index d6a0a43df0e..9dbaebc369b 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRule.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.qualityprofile; +package org.sonar.ce.task.projectanalysis.qualityprofile; import com.google.common.collect.ImmutableMap; import java.util.Map; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualityprofile/ActiveRulesHolder.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolder.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualityprofile/ActiveRulesHolder.java index 7c3c7e4a15f..59c2375b574 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.qualityprofile; +package org.sonar.ce.task.projectanalysis.qualityprofile; import com.google.common.base.Optional; import org.sonar.api.rule.RuleKey; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualityprofile/ActiveRulesHolderImpl.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualityprofile/ActiveRulesHolderImpl.java index 106a5ddd322..92aed185442 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.qualityprofile; +package org.sonar.ce.task.projectanalysis.qualityprofile; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualityprofile/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualityprofile/package-info.java new file mode 100644 index 00000000000..604fc315f92 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/qualityprofile/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.qualityprofile; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/Changeset.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/Changeset.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/Changeset.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/Changeset.java index c376349a748..864d45bce30 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/Changeset.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.scm; +package org.sonar.ce.task.projectanalysis.scm; import java.util.Objects; import javax.annotation.CheckForNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfo.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/DbScmInfo.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfo.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/DbScmInfo.java index ff670adc8cf..dba72f1a94f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfo.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.scm; +package org.sonar.ce.task.projectanalysis.scm; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/GeneratedScmInfo.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/GeneratedScmInfo.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/GeneratedScmInfo.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/GeneratedScmInfo.java index 87b45649d0d..3c73d07e582 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/GeneratedScmInfo.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/GeneratedScmInfo.java @@ -17,7 +17,7 @@ * along with this program; 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.scm; +package org.sonar.ce.task.projectanalysis.scm; import java.util.LinkedHashMap; import java.util.Map; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfo.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/ReportScmInfo.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfo.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/ReportScmInfo.java index d117f344e70..d0314452813 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfo.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.scm; +package org.sonar.ce.task.projectanalysis.scm; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfo.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/ScmInfo.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfo.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/ScmInfo.java index 387d88c1ead..06cbfb9dc2d 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfo.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.scm; +package org.sonar.ce.task.projectanalysis.scm; import java.util.Map; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoDbLoader.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoDbLoader.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoDbLoader.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoDbLoader.java index 4225dff3b59..5c1b9ff65d4 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoDbLoader.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoDbLoader.java @@ -17,18 +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.task.projectanalysis.scm; +package org.sonar.ce.task.projectanalysis.scm; import java.util.Optional; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.MergeBranchComponentUuids; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.source.FileSourceDto; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; -import org.sonar.server.computation.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.component.MergeBranchComponentUuids; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.MergeBranchComponentUuids; public class ScmInfoDbLoader { private static final Logger LOGGER = Loggers.get(ScmInfoDbLoader.class); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoImpl.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoImpl.java index feb4ea4e8a3..d06ba625341 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.scm; +package org.sonar.ce.task.projectanalysis.scm; import java.util.Collections; import java.util.Comparator; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoRepository.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoRepository.java index 2a80de6d63a..605815b5083 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoRepository.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.task.projectanalysis.scm; +package org.sonar.ce.task.projectanalysis.scm; import java.util.Optional; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; /** * Return SCM information of components. diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoRepositoryImpl.java similarity index 87% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoRepositoryImpl.java index c4d89610db9..10d5a5f651f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.scm; +package org.sonar.ce.task.projectanalysis.scm; import java.util.HashMap; import java.util.Map; @@ -28,12 +28,12 @@ import java.util.stream.IntStream; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.scanner.protocol.output.ScannerReport; -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.Component.Status; -import org.sonar.server.computation.task.projectanalysis.source.SourceHashRepository; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesDiff; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component.Status; +import org.sonar.ce.task.projectanalysis.source.SourceHashRepository; +import org.sonar.ce.task.projectanalysis.source.SourceLinesDiff; import static java.util.Objects.requireNonNull; @@ -49,7 +49,7 @@ public class ScmInfoRepositoryImpl implements ScmInfoRepository { private final SourceHashRepository sourceHashRepository; public ScmInfoRepositoryImpl(BatchReportReader scannerReportReader, AnalysisMetadataHolder analysisMetadata, ScmInfoDbLoader scmInfoDbLoader, - SourceLinesDiff sourceLinesDiff, SourceHashRepository sourceHashRepository) { + SourceLinesDiff sourceLinesDiff, SourceHashRepository sourceHashRepository) { this.scannerReportReader = scannerReportReader; this.analysisMetadata = analysisMetadata; this.scmInfoDbLoader = scmInfoDbLoader; @@ -108,10 +108,10 @@ public class ScmInfoRepositoryImpl implements ScmInfoRepository { } /** - * Get SCM information in the DB, if it exists, and use it for lines that didn't change. It optionally removes author and revision + * Get SCM information in the DB, if it exists, and use it for lines that didn't change. It optionally removes author and revision * information (only keeping change dates). - * If the information is not present in the DB or some lines don't match existing lines in the DB, - * we generate change dates based on the analysis date. + * If the information is not present in the DB or some lines don't match existing lines in the DB, + * we generate change dates based on the analysis date. */ private Optional generateAndMergeDb(Component file, boolean keepAuthorAndRevision) { Optional dbInfoOpt = scmInfoDbLoader.getScmInfo(file); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/package-info.java new file mode 100644 index 00000000000..cbad07fb37b --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.scm; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceData.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/ComputeFileSourceData.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceData.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/ComputeFileSourceData.java index 85992b45241..c492be64aee 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceData.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/ComputeFileSourceData.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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import com.google.common.base.Joiner; import java.util.Iterator; import java.util.List; import org.sonar.core.hash.SourceHashComputer; import org.sonar.db.protobuf.DbFileSources; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesHashRepositoryImpl.LineHashesComputer; -import org.sonar.server.computation.task.projectanalysis.source.linereader.LineReader; +import org.sonar.ce.task.projectanalysis.source.SourceLinesHashRepositoryImpl.LineHashesComputer; +import org.sonar.ce.task.projectanalysis.source.linereader.LineReader; public class ComputeFileSourceData { private static final Joiner LINE_RETURN_JOINER = Joiner.on('\n'); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/DbLineHashVersion.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/DbLineHashVersion.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/DbLineHashVersion.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/DbLineHashVersion.java index 75e2d77f8fa..065ec4f079a 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/DbLineHashVersion.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/DbLineHashVersion.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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import java.util.HashMap; import java.util.Map; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.source.LineHashVersion; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; public class DbLineHashVersion { private final Map lineHashVersionPerComponent = new HashMap<>(); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitor.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/LastCommitVisitor.java similarity index 82% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitor.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/LastCommitVisitor.java index 584598b3834..a22f52b2fdb 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitor.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import com.google.common.base.Optional; import org.sonar.api.measures.CoreMetrics; -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; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.PathAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.scm.ScmInfo; +import org.sonar.ce.task.projectanalysis.scm.ScmInfoRepository; + +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; public class LastCommitVisitor extends PathAwareVisitorAdapter { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ReportIterator.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/ReportIterator.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ReportIterator.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/ReportIterator.java index 98fdc51aac0..7fdcfc35e2c 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/ReportIterator.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import com.google.common.base.Throwables; import com.google.protobuf.InvalidProtocolBufferException; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SignificantCodeRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SignificantCodeRepository.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SignificantCodeRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SignificantCodeRepository.java index d97bca8d168..64974bc273c 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SignificantCodeRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SignificantCodeRepository.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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import java.util.Optional; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.hash.LineRange; import org.sonar.core.util.CloseableIterator; import org.sonar.scanner.protocol.output.ScannerReport.LineSgnificantCode; -import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.component.Component; public class SignificantCodeRepository { private final BatchReportReader reportReader; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceHashRepository.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceHashRepository.java index 05f545a57a0..1c19ae71bc8 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceHashRepository.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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; public interface SourceHashRepository { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceHashRepositoryImpl.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceHashRepositoryImpl.java index 95856d29983..77495e7c33b 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceHashRepositoryImpl.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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import java.util.HashMap; import java.util.Map; import javax.annotation.Nullable; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.hash.SourceHashComputer; import org.sonar.core.util.CloseableIterator; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesDiff.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesDiff.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesDiff.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesDiff.java index 99e33032004..f8dc3186fd3 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesDiff.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesDiff.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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; public interface SourceLinesDiff { /** diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesDiffFinder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesDiffFinder.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesDiffFinder.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesDiffFinder.java index e4ac5938b68..0d07936d8f7 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesDiffFinder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesDiffFinder.java @@ -17,7 +17,7 @@ * along with this program; 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.source; +package org.sonar.ce.task.projectanalysis.source; import difflib.myers.DifferentiationFailedException; import difflib.myers.MyersDiff; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesDiffImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesDiffImpl.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesDiffImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesDiffImpl.java index b881e85c373..80cf01baaa4 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesDiffImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesDiffImpl.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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import java.util.Collections; import java.util.List; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.source.FileSourceDao; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; public class SourceLinesDiffImpl implements SourceLinesDiff { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesHashCache.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashCache.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesHashCache.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashCache.java index a35fe930798..4c7994737ca 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesHashCache.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashCache.java @@ -17,7 +17,7 @@ * along with this program; 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.source; +package org.sonar.ce.task.projectanalysis.source; import com.google.common.base.Preconditions; import java.io.IOException; @@ -29,7 +29,8 @@ import java.util.List; import java.util.Set; import java.util.function.Function; import org.sonar.api.utils.TempFolder; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; public class SourceLinesHashCache { private static final String FILE_NAME_PREFIX = "hashes-"; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesHashRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashRepository.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesHashRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashRepository.java index be0ef67b44e..2f7780f650e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesHashRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashRepository.java @@ -17,11 +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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import java.util.List; -import org.sonar.server.computation.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesHashRepositoryImpl.LineHashesComputer; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.source.SourceLinesHashRepositoryImpl.LineHashesComputer; /** * Generates line hashes from source code included in the report. @@ -44,7 +45,7 @@ public interface SourceLinesHashRepository { * The version of the line hashes that are generated by the computer will be the one that takes into account significant code, * if it was provided by a code analyzer. */ - LineHashesComputer getLineHashesComputerToPersist(Component component); + SourceLinesHashRepositoryImpl.LineHashesComputer getLineHashesComputerToPersist(Component component); /** * Get the version of the line hashes for a given component in the report diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesHashRepositoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashRepositoryImpl.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesHashRepositoryImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashRepositoryImpl.java index 6e8ba5e7268..5bf405516f2 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesHashRepositoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashRepositoryImpl.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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import java.util.List; import java.util.Optional; import org.apache.commons.lang.StringUtils; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.hash.LineRange; import org.sonar.core.hash.SourceLineHashesComputer; import org.sonar.core.util.CloseableIterator; import org.sonar.db.source.LineHashVersion; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; public class SourceLinesHashRepositoryImpl implements SourceLinesHashRepository { private final SourceLinesRepository sourceLinesRepository; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepository.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepository.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepository.java index c2a2a3d2831..7ba971f4ae4 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.util.CloseableIterator; -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.task.projectanalysis.batch.BatchReportReader#readFileSource(int)} but enforces that the number + * {@link org.sonar.ce.task.projectanalysis.batch.BatchReportReader#readFileSource(int)} but enforces that the number * of lines specified by {@link org.sonar.scanner.protocol.output.ScannerReport.Component#getLines()} is respected, adding * an extra empty last line if required. *

diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepositoryImpl.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImpl.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepositoryImpl.java index 3366a28802b..f21dbe879f9 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import java.util.Optional; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.util.CloseableIterator; -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.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; public class SourceLinesRepositoryImpl implements SourceLinesRepository { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/CoverageLineReader.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/CoverageLineReader.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/CoverageLineReader.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/CoverageLineReader.java index 7660491eb72..43540c7e058 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/CoverageLineReader.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/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.task.projectanalysis.source.linereader; +package org.sonar.ce.task.projectanalysis.source.linereader; import java.util.Iterator; import javax.annotation.CheckForNull; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/DuplicationLineReader.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/DuplicationLineReader.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/DuplicationLineReader.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/DuplicationLineReader.java index ffaa942de91..985dbcdb2b1 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/DuplicationLineReader.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/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.task.projectanalysis.source.linereader; +package org.sonar.ce.task.projectanalysis.source.linereader; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -28,10 +28,14 @@ import java.util.List; import java.util.Map; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import org.sonar.ce.task.projectanalysis.duplication.Duplicate; +import org.sonar.ce.task.projectanalysis.duplication.Duplication; +import org.sonar.ce.task.projectanalysis.duplication.InnerDuplicate; +import org.sonar.ce.task.projectanalysis.duplication.TextBlock; import org.sonar.db.protobuf.DbFileSources; -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 org.sonar.ce.task.projectanalysis.duplication.Duplication; +import org.sonar.ce.task.projectanalysis.duplication.InnerDuplicate; +import org.sonar.ce.task.projectanalysis.duplication.TextBlock; import static com.google.common.collect.FluentIterable.from; import static com.google.common.collect.Iterables.size; @@ -73,7 +77,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.task.projectanalysis.duplication.Duplicate} is a {@link InnerDuplicate}. + * when the {@link Duplicate} is a {@link InnerDuplicate}. *

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

diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/HighlightingLineReader.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/HighlightingLineReader.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/HighlightingLineReader.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/HighlightingLineReader.java index 69f1306f82a..b4f71abadf4 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/HighlightingLineReader.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/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.task.projectanalysis.source.linereader; +package org.sonar.ce.task.projectanalysis.source.linereader; import com.google.common.collect.ImmutableMap; import java.util.Iterator; @@ -26,16 +26,16 @@ import java.util.Map; import javax.annotation.CheckForNull; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.source.linereader.RangeOffsetConverter.RangeOffsetConverterException; 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.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.source.linereader.RangeOffsetConverter.RangeOffsetConverterException; import static com.google.common.collect.Lists.newArrayList; import static java.lang.String.format; -import static org.sonar.server.computation.task.projectanalysis.source.linereader.RangeOffsetConverter.OFFSET_SEPARATOR; -import static org.sonar.server.computation.task.projectanalysis.source.linereader.RangeOffsetConverter.SYMBOLS_SEPARATOR; +import static org.sonar.ce.task.projectanalysis.source.linereader.RangeOffsetConverter.OFFSET_SEPARATOR; +import static org.sonar.ce.task.projectanalysis.source.linereader.RangeOffsetConverter.SYMBOLS_SEPARATOR; public class HighlightingLineReader implements LineReader { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/LineReader.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/LineReader.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/LineReader.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/LineReader.java index 4acf9e08341..2057c701a1a 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/LineReader.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/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.task.projectanalysis.source.linereader; +package org.sonar.ce.task.projectanalysis.source.linereader; import org.sonar.db.protobuf.DbFileSources; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/RangeOffsetConverter.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/RangeOffsetConverter.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/RangeOffsetConverter.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/RangeOffsetConverter.java index d7f1e355bad..f1c2f8c1190 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/RangeOffsetConverter.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/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.task.projectanalysis.source.linereader; +package org.sonar.ce.task.projectanalysis.source.linereader; import org.sonar.scanner.protocol.output.ScannerReport; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/ScmLineReader.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/ScmLineReader.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/ScmLineReader.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/ScmLineReader.java index c2759f60c86..da1fd077cc3 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/ScmLineReader.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/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.task.projectanalysis.source.linereader; +package org.sonar.ce.task.projectanalysis.source.linereader; import javax.annotation.CheckForNull; import org.sonar.db.protobuf.DbFileSources; -import org.sonar.server.computation.task.projectanalysis.scm.Changeset; -import org.sonar.server.computation.task.projectanalysis.scm.ScmInfo; +import org.sonar.ce.task.projectanalysis.scm.Changeset; +import org.sonar.ce.task.projectanalysis.scm.ScmInfo; public class ScmLineReader implements LineReader { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/SymbolsLineReader.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/SymbolsLineReader.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/SymbolsLineReader.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/SymbolsLineReader.java index dacf3902763..c3e1f746921 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/SymbolsLineReader.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/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.task.projectanalysis.source.linereader; +package org.sonar.ce.task.projectanalysis.source.linereader; import com.google.common.collect.HashMultimap; import com.google.common.collect.Lists; @@ -31,13 +31,13 @@ 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.ce.task.projectanalysis.component.Component; import org.sonar.db.protobuf.DbFileSources; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.task.projectanalysis.component.Component; import static java.lang.String.format; -import static org.sonar.server.computation.task.projectanalysis.source.linereader.RangeOffsetConverter.OFFSET_SEPARATOR; -import static org.sonar.server.computation.task.projectanalysis.source.linereader.RangeOffsetConverter.SYMBOLS_SEPARATOR; +import static org.sonar.ce.task.projectanalysis.source.linereader.RangeOffsetConverter.OFFSET_SEPARATOR; +import static org.sonar.ce.task.projectanalysis.source.linereader.RangeOffsetConverter.SYMBOLS_SEPARATOR; public class SymbolsLineReader implements LineReader { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/package-info.java new file mode 100644 index 00000000000..5f231861dd3 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/linereader/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.source.linereader; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/package-info.java new file mode 100644 index 00000000000..564a412b195 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.source; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/AbstractComputationSteps.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/AbstractComputationSteps.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/AbstractComputationSteps.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/AbstractComputationSteps.java index 9643c509ce1..5f46ebb9577 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/AbstractComputationSteps.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/AbstractComputationSteps.java @@ -17,7 +17,7 @@ * along with this program; 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.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.collect.Iterables; import org.sonar.core.platform.ContainerPopulator; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/BuildComponentTreeStep.java similarity index 79% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/BuildComponentTreeStep.java index 36dcfd5845d..88e224bda64 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/BuildComponentTreeStep.java @@ -17,25 +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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import javax.annotation.CheckForNull; import javax.annotation.Nullable; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ComponentKeyGenerator; +import org.sonar.ce.task.projectanalysis.component.ComponentTreeBuilder; +import org.sonar.ce.task.projectanalysis.component.ComponentUuidFactory; +import org.sonar.ce.task.projectanalysis.component.DefaultBranchImpl; +import org.sonar.ce.task.projectanalysis.component.MutableTreeRootHolder; 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.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.task.projectanalysis.analysis.Analysis; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; -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.ComponentKeyGenerator; -import org.sonar.server.computation.task.projectanalysis.component.ComponentTreeBuilder; -import org.sonar.server.computation.task.projectanalysis.component.ComponentUuidFactory; -import org.sonar.server.computation.task.projectanalysis.component.DefaultBranchImpl; -import org.sonar.server.computation.task.projectanalysis.component.MutableTreeRootHolder; +import org.sonar.ce.task.projectanalysis.analysis.Analysis; +import org.sonar.ce.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ComponentKeyGenerator; +import org.sonar.ce.task.projectanalysis.component.ComponentTreeBuilder; +import org.sonar.ce.task.projectanalysis.component.ComponentUuidFactory; +import org.sonar.ce.task.projectanalysis.component.DefaultBranchImpl; +import org.sonar.ce.task.projectanalysis.component.MutableTreeRootHolder; import org.sonar.server.computation.task.step.ComputationStep; /** diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CommentMeasuresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/CommentMeasuresStep.java similarity index 83% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CommentMeasuresStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/CommentMeasuresStep.java index e2e567c6dc1..6b5f6d1b5e4 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CommentMeasuresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/CommentMeasuresStep.java @@ -17,24 +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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; -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.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.formula.Counter; +import org.sonar.ce.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.ce.task.projectanalysis.formula.Formula; +import org.sonar.ce.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.formula.Counter; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.ce.task.projectanalysis.formula.Formula; +import org.sonar.ce.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.ce.task.projectanalysis.formula.counter.IntSumCounter; +import org.sonar.ce.task.projectanalysis.formula.counter.SumCounter; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.server.computation.task.step.ComputationStep; import static org.sonar.api.measures.CoreMetrics.COMMENTED_OUT_CODE_LINES_KEY; @@ -44,7 +51,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.task.projectanalysis.formula.SumFormula.createIntSumFormula; +import static org.sonar.ce.task.projectanalysis.formula.SumFormula.createIntSumFormula; /** * Computes comments measures on files and then aggregates them on higher components. diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComplexityMeasuresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ComplexityMeasuresStep.java similarity index 77% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComplexityMeasuresStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ComplexityMeasuresStep.java index 31fad25f7f4..506e2f50a1b 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComplexityMeasuresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ComplexityMeasuresStep.java @@ -17,17 +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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.collect.ImmutableList; -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.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.formula.AverageFormula; +import org.sonar.ce.task.projectanalysis.formula.DistributionFormula; +import org.sonar.ce.task.projectanalysis.formula.Formula; +import org.sonar.ce.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.formula.AverageFormula; +import org.sonar.ce.task.projectanalysis.formula.DistributionFormula; +import org.sonar.ce.task.projectanalysis.formula.Formula; +import org.sonar.ce.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.server.computation.task.step.ComputationStep; import static org.sonar.api.measures.CoreMetrics.CLASSES_KEY; @@ -43,7 +49,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.task.projectanalysis.formula.SumFormula.createIntSumFormula; +import static org.sonar.ce.task.projectanalysis.formula.SumFormula.createIntSumFormula; /** * Computes complexity measures on files and then aggregates them on higher components. diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeMeasureVariationsStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ComputeMeasureVariationsStep.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeMeasureVariationsStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ComputeMeasureVariationsStep.java index 25f50a8a3d6..568dbcb2c18 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeMeasureVariationsStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Optional; import java.util.Collection; @@ -29,31 +29,31 @@ import java.util.function.Predicate; import java.util.stream.StreamSupport; import javax.annotation.CheckForNull; import javax.annotation.Nullable; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureKey; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolder; import org.sonar.core.util.stream.MoreCollectors; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.measure.PastMeasureDto; -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.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.PeriodHolder; import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.base.Preconditions.checkArgument; import static java.lang.String.format; import static java.util.function.Function.identity; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; import static org.sonar.core.util.stream.MoreCollectors.uniqueIndex; -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. @@ -70,7 +70,7 @@ public class ComputeMeasureVariationsStep implements ComputationStep { private final MeasureRepository measureRepository; public ComputeMeasureVariationsStep(DbClient dbClient, TreeRootHolder treeRootHolder, PeriodHolder periodHolder, MetricRepository metricRepository, - MeasureRepository measureRepository) { + MeasureRepository measureRepository) { this.dbClient = dbClient; this.treeRootHolder = treeRootHolder; this.periodHolder = periodHolder; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ComputeQProfileMeasureStep.java similarity index 81% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ComputeQProfileMeasureStep.java index 4abc09a4edf..c0a5c784412 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ComputeQProfileMeasureStep.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.HashMap; import java.util.Map; import org.sonar.api.measures.CoreMetrics; -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.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.PathAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.qualityprofile.QPMeasureData; import org.sonar.server.qualityprofile.QualityProfile; -import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; /** * Compute quality profile measure per module based on present languages diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CoverageMeasuresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/CoverageMeasuresStep.java similarity index 72% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CoverageMeasuresStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/CoverageMeasuresStep.java index 214455f0996..26cd17354a8 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CoverageMeasuresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/CoverageMeasuresStep.java @@ -17,19 +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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.collect.ImmutableList; -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.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.formula.Formula; +import org.sonar.ce.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.ce.task.projectanalysis.formula.coverage.LinesAndConditionsWithUncoveredFormula; +import org.sonar.ce.task.projectanalysis.formula.coverage.SingleWithUncoveredMetricKeys; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.formula.Formula; +import org.sonar.ce.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.ce.task.projectanalysis.formula.coverage.LinesAndConditionsWithUncoveredFormula; +import org.sonar.ce.task.projectanalysis.formula.coverage.LinesAndConditionsWithUncoveredMetricKeys; +import org.sonar.ce.task.projectanalysis.formula.coverage.SingleWithUncoveredFormula; +import org.sonar.ce.task.projectanalysis.formula.coverage.SingleWithUncoveredMetricKeys; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.server.computation.task.step.ComputationStep; import static org.sonar.api.measures.CoreMetrics.BRANCH_COVERAGE_KEY; @@ -39,7 +45,7 @@ import static org.sonar.api.measures.CoreMetrics.LINES_TO_COVER_KEY; import static org.sonar.api.measures.CoreMetrics.LINE_COVERAGE_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.task.projectanalysis.formula.SumFormula.createIntSumFormula; +import static org.sonar.ce.task.projectanalysis.formula.SumFormula.createIntSumFormula; /** * Computes coverage measures on files and then aggregates them on higher components. diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/CustomMeasuresCopyStep.java similarity index 78% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/CustomMeasuresCopyStep.java index 9ce49c0aa7e..c3a18db9121 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/CustomMeasuresCopyStep.java @@ -17,24 +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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.annotations.VisibleForTesting; import java.util.List; import org.apache.commons.lang.math.NumberUtils; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ComponentVisitor; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.measure.custom.CustomMeasureDto; -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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ComponentVisitor; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.server.computation.task.step.ComputationStep; public class CustomMeasuresCopyStep implements ComputationStep { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DbMigrationsStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/DbMigrationsStep.java similarity index 81% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DbMigrationsStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/DbMigrationsStep.java index 0a44b823feb..da30c091d09 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DbMigrationsStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/DbMigrationsStep.java @@ -17,11 +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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.sql.SQLException; -import org.sonar.server.computation.task.projectanalysis.dbmigration.ProjectAnalysisDataChange; -import org.sonar.server.computation.task.projectanalysis.dbmigration.ProjectAnalysisDataChanges; +import org.sonar.ce.task.projectanalysis.dbmigration.ProjectAnalysisDataChange; +import org.sonar.ce.task.projectanalysis.dbmigration.ProjectAnalysisDataChanges; +import org.sonar.ce.task.projectanalysis.dbmigration.ProjectAnalysisDataChange; +import org.sonar.ce.task.projectanalysis.dbmigration.ProjectAnalysisDataChanges; import org.sonar.server.computation.task.step.ComputationStep; public class DbMigrationsStep implements ComputationStep { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/DuplicationDataMeasuresStep.java similarity index 75% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/DuplicationDataMeasuresStep.java index f7b2b53331a..0f6d2da8ffa 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/DuplicationDataMeasuresStep.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.apache.commons.lang.StringEscapeUtils; -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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.duplication.CrossProjectDuplicate; +import org.sonar.ce.task.projectanalysis.duplication.Duplicate; +import org.sonar.ce.task.projectanalysis.duplication.Duplication; +import org.sonar.ce.task.projectanalysis.duplication.DuplicationRepository; +import org.sonar.ce.task.projectanalysis.duplication.InProjectDuplicate; +import org.sonar.ce.task.projectanalysis.duplication.InnerDuplicate; +import org.sonar.ce.task.projectanalysis.duplication.TextBlock; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.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.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; /** * Compute duplication data measures on files, based on the {@link DuplicationRepository} @@ -86,8 +86,7 @@ public class DuplicationDataMeasuresStep implements ComputationStep { measureRepository.add( component, duplicationDataMetric, - Measure.newMeasureBuilder().create(duplicationXml) - ); + Measure.newMeasureBuilder().create(duplicationXml)); } private String createXmlDuplications(String componentKey, Iterable duplications) { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationMeasuresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/DuplicationMeasuresStep.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationMeasuresStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/DuplicationMeasuresStep.java index 9d868c0f5f2..ec8b797a0b5 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationMeasuresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/DuplicationMeasuresStep.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.task.projectanalysis.duplication.DuplicationMeasures; +import org.sonar.ce.task.projectanalysis.duplication.DuplicationMeasures; import org.sonar.server.computation.task.step.ComputationStep; /** diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/EnableAnalysisStep.java similarity index 86% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/EnableAnalysisStep.java index 7e375082fed..c29701921e4 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/EnableAnalysisStep.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.db.DbClient; import org.sonar.db.DbSession; -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.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; import org.sonar.server.computation.task.step.ComputationStep; public class EnableAnalysisStep implements ComputationStep { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ExecuteVisitorsStep.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ExecuteVisitorsStep.java index 78f71c9cac9..f656553cbe2 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ExecuteVisitorsStep.java @@ -17,15 +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.task.projectanalysis.step; +package org.sonar.ce.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.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.ce.task.projectanalysis.component.ComponentVisitor; +import org.sonar.ce.task.projectanalysis.component.VisitorsCrawler; +import org.sonar.ce.task.projectanalysis.component.ComponentVisitor; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.VisitorsCrawler; import org.sonar.server.computation.task.step.ComputationStep; public class ExecuteVisitorsStep implements ComputationStep { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStep.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStep.java index 1e6151b92a4..6be254e1ae6 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.io.BufferedInputStream; import java.io.File; @@ -31,7 +31,7 @@ import org.sonar.ce.queue.CeTask; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.ce.CeTaskInputDao; -import org.sonar.server.computation.task.projectanalysis.batch.MutableBatchReportDirectoryHolder; +import org.sonar.ce.task.projectanalysis.batch.MutableBatchReportDirectoryHolder; import org.sonar.server.computation.task.step.ComputationStep; /** diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/GenerateAnalysisUuid.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/GenerateAnalysisUuid.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/GenerateAnalysisUuid.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/GenerateAnalysisUuid.java index 764dd119f86..cd4630aa883 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/GenerateAnalysisUuid.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/GenerateAnalysisUuid.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.sonar.core.util.UuidFactory; -import org.sonar.server.computation.task.projectanalysis.analysis.MutableAnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolder; import org.sonar.server.computation.task.step.ComputationStep; public class GenerateAnalysisUuid implements ComputationStep { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/IndexAnalysisStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/IndexAnalysisStep.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/IndexAnalysisStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/IndexAnalysisStep.java index 8f1c14f5a2e..6f61c990230 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/IndexAnalysisStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/IndexAnalysisStep.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.es.ProjectIndexer; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LanguageDistributionMeasuresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LanguageDistributionMeasuresStep.java similarity index 79% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LanguageDistributionMeasuresStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LanguageDistributionMeasuresStep.java index 77478199dca..7bae369216b 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LanguageDistributionMeasuresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -29,17 +29,24 @@ 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.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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.formula.Counter; +import org.sonar.ce.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.ce.task.projectanalysis.formula.Formula; +import org.sonar.ce.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.formula.Counter; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.ce.task.projectanalysis.formula.Formula; +import org.sonar.ce.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.Maps.asMap; @@ -47,7 +54,7 @@ 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.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; public class LanguageDistributionMeasuresStep implements ComputationStep { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStep.java similarity index 83% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStep.java index 6cb0f39218f..033dbac937d 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Function; import java.util.Collection; @@ -25,6 +25,11 @@ import java.util.List; import javax.annotation.Nonnull; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.duplication.CrossProjectDuplicationStatusHolder; +import org.sonar.ce.task.projectanalysis.duplication.IntegrateCrossProjectDuplications; import org.sonar.core.util.CloseableIterator; import org.sonar.db.DbClient; import org.sonar.db.DbSession; @@ -32,21 +37,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.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.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.duplication.CrossProjectDuplicationStatusHolder; +import org.sonar.ce.task.projectanalysis.duplication.IntegrateCrossProjectDuplications; +import org.sonar.ce.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.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.ce.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. @@ -92,7 +97,7 @@ public class LoadCrossProjectDuplicationsRepositoryStep implements ComputationSt private class CrossProjectDuplicationVisitor extends TypeAwareVisitorAdapter { private CrossProjectDuplicationVisitor() { - super(CrawlerDepthLimit.FILE, PRE_ORDER); + super(CrawlerDepthLimit.FILE, Order.PRE_ORDER); } @Override diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadDuplicationsFromReportStep.java similarity index 67% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadDuplicationsFromReportStep.java index 7750aa2d7bc..20e1e32f2e6 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadDuplicationsFromReportStep.java @@ -17,30 +17,41 @@ * along with this program; 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.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Function; import javax.annotation.Nonnull; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ComponentVisitor; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.duplication.DetailedTextBlock; +import org.sonar.ce.task.projectanalysis.duplication.Duplicate; +import org.sonar.ce.task.projectanalysis.duplication.Duplication; +import org.sonar.ce.task.projectanalysis.duplication.DuplicationRepository; +import org.sonar.ce.task.projectanalysis.duplication.InProjectDuplicate; +import org.sonar.ce.task.projectanalysis.duplication.InnerDuplicate; +import org.sonar.ce.task.projectanalysis.duplication.TextBlock; import org.sonar.core.util.CloseableIterator; import org.sonar.scanner.protocol.output.ScannerReport; -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.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.duplication.DetailedTextBlock; +import org.sonar.ce.task.projectanalysis.duplication.Duplicate; +import org.sonar.ce.task.projectanalysis.duplication.Duplication; +import org.sonar.ce.task.projectanalysis.duplication.DuplicationRepository; +import org.sonar.ce.task.projectanalysis.duplication.InProjectDuplicate; +import org.sonar.ce.task.projectanalysis.duplication.InnerDuplicate; +import org.sonar.ce.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.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; /** * Loads duplication information from the report and loads them into the {@link DuplicationRepository}. @@ -64,7 +75,7 @@ public class LoadDuplicationsFromReportStep implements ComputationStep { @Override public void execute() { new DepthTraversalTypeAwareCrawler( - new TypeAwareVisitorAdapter(CrawlerDepthLimit.FILE, POST_ORDER) { + new TypeAwareVisitorAdapter(CrawlerDepthLimit.FILE, ComponentVisitor.Order.POST_ORDER) { @Override public void visitFile(Component file) { try (CloseableIterator duplications = batchReportReader.readComponentDuplications(file.getReportAttributes().getRef())) { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadMeasureComputersStep.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadMeasureComputersStep.java index 3e896a2d1fb..93a47e3305b 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -36,9 +36,11 @@ 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.task.projectanalysis.api.measurecomputer.MeasureComputerDefinitionImpl; -import org.sonar.server.computation.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; -import org.sonar.server.computation.task.projectanalysis.measure.MutableMeasureComputersHolder; +import org.sonar.ce.task.projectanalysis.api.measurecomputer.MeasureComputerDefinitionImpl; +import org.sonar.ce.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; +import org.sonar.ce.task.projectanalysis.api.measurecomputer.MeasureComputerDefinitionImpl; +import org.sonar.ce.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; +import org.sonar.ce.task.projectanalysis.measure.MutableMeasureComputersHolder; import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.base.Preconditions.checkState; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadPeriodsStep.java similarity index 70% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadPeriodsStep.java index ed219dc8981..dfb579f926f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadPeriodsStep.java @@ -17,27 +17,35 @@ * along with this program; 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.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Optional; import javax.annotation.CheckForNull; import org.sonar.api.config.Configuration; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ComponentVisitor; +import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolder; +import org.sonar.ce.task.projectanalysis.period.PeriodHolderImpl; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.component.ComponentDto; -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.ConfigurationRepository; -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.period.Period; -import org.sonar.server.computation.task.projectanalysis.period.PeriodHolder; -import org.sonar.server.computation.task.projectanalysis.period.PeriodHolderImpl; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolder; +import org.sonar.ce.task.projectanalysis.period.PeriodHolderImpl; import org.sonar.server.computation.task.step.ComputationStep; -import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; /** * Populates the {@link PeriodHolder} @@ -67,7 +75,7 @@ public class LoadPeriodsStep implements ComputationStep { @Override public void execute() { new DepthTraversalTypeAwareCrawler( - new TypeAwareVisitorAdapter(CrawlerDepthLimit.PROJECT, PRE_ORDER) { + new TypeAwareVisitorAdapter(CrawlerDepthLimit.PROJECT, ComponentVisitor.Order.PRE_ORDER) { @Override public void visitProject(Component project) { execute(project); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityGateStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadQualityGateStep.java similarity index 84% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityGateStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadQualityGateStep.java index 89b97b839c0..2309369b692 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityGateStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadQualityGateStep.java @@ -17,15 +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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.Optional; import org.sonar.api.config.Configuration; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.task.projectanalysis.component.ConfigurationRepository; -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.ce.task.projectanalysis.component.ConfigurationRepository; +import org.sonar.ce.task.projectanalysis.qualitygate.MutableQualityGateHolder; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGate; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateService; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; +import org.sonar.ce.task.projectanalysis.qualitygate.MutableQualityGateHolder; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGate; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateService; import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.qualitygate.ShortLivingBranchQualityGate; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadQualityProfilesStep.java similarity index 82% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadQualityProfilesStep.java index 88eecf3ce99..d7e021b4c92 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.ArrayList; import java.util.HashMap; @@ -26,13 +26,17 @@ import java.util.Map; import java.util.Optional; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; +import org.sonar.ce.task.projectanalysis.issue.Rule; +import org.sonar.ce.task.projectanalysis.issue.RuleRepository; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolderImpl; import org.sonar.core.util.CloseableIterator; import org.sonar.scanner.protocol.output.ScannerReport; -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.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.issue.Rule; +import org.sonar.ce.task.projectanalysis.issue.RuleRepository; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolderImpl; import org.sonar.server.computation.task.step.ComputationStep; public class LoadQualityProfilesStep implements ComputationStep { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java index 3ef211cc2cb..9312df812d9 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Joiner; import java.util.Date; @@ -28,6 +28,7 @@ import javax.annotation.Nullable; import org.apache.commons.lang.StringUtils; import org.sonar.api.utils.MessageException; import org.sonar.ce.queue.CeTask; +import org.sonar.ce.task.projectanalysis.component.BranchLoader; import org.sonar.core.component.ComponentKeys; import org.sonar.core.platform.PluginRepository; import org.sonar.core.util.stream.MoreCollectors; @@ -39,11 +40,11 @@ import org.sonar.db.qualityprofile.QProfileDto; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.Metadata.Plugin; import org.sonar.scanner.protocol.output.ScannerReport.Metadata.QProfile; -import org.sonar.server.computation.task.projectanalysis.analysis.MutableAnalysisMetadataHolder; -import org.sonar.server.computation.task.projectanalysis.analysis.Organization; -import org.sonar.server.computation.task.projectanalysis.analysis.ScannerPlugin; -import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; -import org.sonar.server.computation.task.projectanalysis.component.BranchLoader; +import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.Organization; +import org.sonar.ce.task.projectanalysis.analysis.ScannerPlugin; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.component.BranchLoader; import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.organization.DefaultOrganizationProvider; import org.sonar.server.organization.OrganizationFlags; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewCoverageMeasuresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/NewCoverageMeasuresStep.java similarity index 83% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewCoverageMeasuresStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/NewCoverageMeasuresStep.java index 9e5188ae035..09187f082ad 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewCoverageMeasuresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; @@ -31,32 +31,47 @@ 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.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.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.VariationSumFormula; -import org.sonar.server.computation.task.projectanalysis.formula.counter.IntValue; -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.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.PeriodHolder; -import org.sonar.server.computation.task.projectanalysis.scm.ScmInfo; -import org.sonar.server.computation.task.projectanalysis.scm.ScmInfoRepository; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.formula.Counter; +import org.sonar.ce.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.ce.task.projectanalysis.formula.Formula; +import org.sonar.ce.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.ce.task.projectanalysis.formula.coverage.LinesAndConditionsWithUncoveredVariationFormula; +import org.sonar.ce.task.projectanalysis.formula.coverage.SingleWithUncoveredMetricKeys; +import org.sonar.ce.task.projectanalysis.formula.coverage.SingleWithUncoveredVariationFormula; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolder; +import org.sonar.ce.task.projectanalysis.scm.ScmInfo; +import org.sonar.ce.task.projectanalysis.scm.ScmInfoRepository; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.formula.Counter; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.ce.task.projectanalysis.formula.Formula; +import org.sonar.ce.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.ce.task.projectanalysis.formula.VariationSumFormula; +import org.sonar.ce.task.projectanalysis.formula.counter.IntValue; +import org.sonar.ce.task.projectanalysis.formula.coverage.LinesAndConditionsWithUncoveredMetricKeys; +import org.sonar.ce.task.projectanalysis.formula.coverage.LinesAndConditionsWithUncoveredVariationFormula; +import org.sonar.ce.task.projectanalysis.formula.coverage.SingleWithUncoveredMetricKeys; +import org.sonar.ce.task.projectanalysis.formula.coverage.SingleWithUncoveredVariationFormula; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolder; +import org.sonar.ce.task.projectanalysis.scm.ScmInfo; +import org.sonar.ce.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.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; /** * Computes measures related to the New Coverage. These measures do not have values, only variations. @@ -137,7 +152,7 @@ public class NewCoverageMeasuresStep implements ComputationStep { } /** - * Creates a List of {@link org.sonar.server.computation.task.projectanalysis.formula.SumFormula.IntSumFormula} for each + * Creates a List of {@link org.sonar.ce.task.projectanalysis.formula.SumFormula.IntSumFormula} for each * metric key of the specified {@link NewCoverageOutputMetricKeys} instance. */ private static Iterable> variationSumFormulas(NewCoverageOutputMetricKeys outputMetricKeys) { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewSizeMeasuresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/NewSizeMeasuresStep.java similarity index 81% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewSizeMeasuresStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/NewSizeMeasuresStep.java index 20250311c05..4ad3916da9f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewSizeMeasuresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/NewSizeMeasuresStep.java @@ -17,34 +17,43 @@ * along with this program; 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.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import java.util.HashSet; import java.util.Set; import java.util.stream.IntStream; -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.formula.counter.IntValue; -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.period.Period; -import org.sonar.server.computation.task.projectanalysis.period.PeriodHolder; -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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.duplication.Duplication; +import org.sonar.ce.task.projectanalysis.duplication.DuplicationRepository; +import org.sonar.ce.task.projectanalysis.duplication.InnerDuplicate; +import org.sonar.ce.task.projectanalysis.duplication.TextBlock; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.duplication.Duplication; +import org.sonar.ce.task.projectanalysis.duplication.DuplicationRepository; +import org.sonar.ce.task.projectanalysis.duplication.InnerDuplicate; +import org.sonar.ce.task.projectanalysis.duplication.TextBlock; +import org.sonar.ce.task.projectanalysis.formula.Counter; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.ce.task.projectanalysis.formula.Formula; +import org.sonar.ce.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.ce.task.projectanalysis.formula.counter.IntValue; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolder; +import org.sonar.ce.task.projectanalysis.scm.Changeset; +import org.sonar.ce.task.projectanalysis.scm.ScmInfo; +import org.sonar.ce.task.projectanalysis.scm.ScmInfoRepository; import org.sonar.server.computation.task.step.ComputationStep; import static org.sonar.api.measures.CoreMetrics.NEW_BLOCKS_DUPLICATED_KEY; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PeriodResolver.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PeriodResolver.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PeriodResolver.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PeriodResolver.java index 51b09bd7606..0f628517fce 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PeriodResolver.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.time.temporal.ChronoUnit; import java.util.Date; @@ -29,11 +29,12 @@ import org.sonar.api.config.Configuration; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; +import org.sonar.ce.task.projectanalysis.period.Period; 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.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.Period; import static org.sonar.core.config.CorePropertyDefinitions.LEAK_PERIOD; import static org.sonar.core.config.CorePropertyDefinitions.LEAK_PERIOD_MODE_DATE; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistAnalysisPropertiesStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisPropertiesStep.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistAnalysisPropertiesStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisPropertiesStep.java index 3ca4d4a33e7..9aa11ec71b7 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistAnalysisPropertiesStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisPropertiesStep.java @@ -17,7 +17,7 @@ * along with this program; 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.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.ArrayList; import java.util.List; @@ -25,8 +25,8 @@ import org.sonar.core.util.UuidFactory; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.component.AnalysisPropertyDto; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; import org.sonar.server.computation.task.step.ComputationStep; import static org.sonar.core.config.CorePropertyDefinitions.SONAR_ANALYSIS; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistAnalysisStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisStep.java similarity index 81% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistAnalysisStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisStep.java index 6a8db2ed643..fb8bf05fe8e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistAnalysisStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisStep.java @@ -17,20 +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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolder; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.component.SnapshotDto; -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.period.Period; -import org.sonar.server.computation.task.projectanalysis.period.PeriodHolder; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolder; import org.sonar.server.computation.task.step.ComputationStep; /** diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistComponentsStep.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistComponentsStep.java index bec3e31fc97..c4c47bff7e3 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Predicate; import java.util.Collection; @@ -35,30 +35,30 @@ import org.apache.commons.lang.StringUtils; import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Scopes; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.component.BranchPersister; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DbIdsRepositoryImpl; +import org.sonar.ce.task.projectanalysis.component.MutableDbIdsRepository; +import org.sonar.ce.task.projectanalysis.component.MutableDisabledComponentsHolder; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.PathAwareVisitor; +import org.sonar.ce.task.projectanalysis.component.PathAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; import org.sonar.core.util.stream.MoreCollectors; 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.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.task.projectanalysis.component.BranchPersister; -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 java.util.Optional.ofNullable; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; import static org.sonar.db.component.ComponentDto.UUID_PATH_OF_ROOT; import static org.sonar.db.component.ComponentDto.UUID_PATH_SEPARATOR; import static org.sonar.db.component.ComponentDto.formatUuidPathFromParent; -import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; /** * Persist report components diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java similarity index 81% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java index 949750133a2..183347f27cf 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java @@ -17,24 +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.task.projectanalysis.step; - +package org.sonar.ce.task.projectanalysis.step; + +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.duplication.CrossProjectDuplicationStatusHolder; 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.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.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; /** * Persist cross project duplications text blocks into DUPLICATIONS_INDEX table diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistEventsStep.java similarity index 86% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistEventsStep.java index e2fe1e6e49e..3f574225171 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistEventsStep.java @@ -17,25 +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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.StreamSupport; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; import org.sonar.core.util.UuidFactory; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.event.EventDto; -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.event.Event; -import org.sonar.server.computation.task.projectanalysis.event.EventRepository; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.event.Event; +import org.sonar.ce.task.projectanalysis.event.EventRepository; import org.sonar.server.computation.task.step.ComputationStep; public class PersistEventsStep implements ComputationStep { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistExternalRulesStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistExternalRulesStep.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistExternalRulesStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistExternalRulesStep.java index af997edf208..b672e40996d 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistExternalRulesStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistExternalRulesStep.java @@ -17,11 +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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; +import org.sonar.ce.task.projectanalysis.issue.RuleRepository; import org.sonar.db.DbClient; import org.sonar.db.DbSession; -import org.sonar.server.computation.task.projectanalysis.issue.RuleRepository; +import org.sonar.ce.task.projectanalysis.issue.RuleRepository; import org.sonar.server.computation.task.step.ComputationStep; public class PersistExternalRulesStep implements ComputationStep { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistFileSourcesStep.java similarity index 81% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistFileSourcesStep.java index 7ed6759b6ac..5c836c67dc1 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.collect.ImmutableMap; import java.util.ArrayList; @@ -30,6 +30,27 @@ import javax.annotation.Nullable; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.ObjectUtils; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.duplication.DuplicationRepository; +import org.sonar.ce.task.projectanalysis.scm.Changeset; +import org.sonar.ce.task.projectanalysis.scm.ScmInfo; +import org.sonar.ce.task.projectanalysis.scm.ScmInfoRepository; +import org.sonar.ce.task.projectanalysis.source.ComputeFileSourceData; +import org.sonar.ce.task.projectanalysis.source.SourceLinesHashRepository; +import org.sonar.ce.task.projectanalysis.source.SourceLinesHashRepositoryImpl.LineHashesComputer; +import org.sonar.ce.task.projectanalysis.source.SourceLinesRepository; +import org.sonar.ce.task.projectanalysis.source.linereader.CoverageLineReader; +import org.sonar.ce.task.projectanalysis.source.linereader.DuplicationLineReader; +import org.sonar.ce.task.projectanalysis.source.linereader.HighlightingLineReader; +import org.sonar.ce.task.projectanalysis.source.linereader.LineReader; +import org.sonar.ce.task.projectanalysis.source.linereader.RangeOffsetConverter; +import org.sonar.ce.task.projectanalysis.source.linereader.ScmLineReader; +import org.sonar.ce.task.projectanalysis.source.linereader.SymbolsLineReader; import org.sonar.core.util.CloseableIterator; import org.sonar.db.DbClient; import org.sonar.db.DbSession; @@ -37,30 +58,9 @@ 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.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.SourceLinesHashRepositoryImpl.LineHashesComputer; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesHashRepository; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesRepository; -import org.sonar.server.computation.task.projectanalysis.source.linereader.CoverageLineReader; -import org.sonar.server.computation.task.projectanalysis.source.linereader.DuplicationLineReader; -import org.sonar.server.computation.task.projectanalysis.source.linereader.HighlightingLineReader; -import org.sonar.server.computation.task.projectanalysis.source.linereader.LineReader; -import org.sonar.server.computation.task.projectanalysis.source.linereader.RangeOffsetConverter; -import org.sonar.server.computation.task.projectanalysis.source.linereader.ScmLineReader; -import org.sonar.server.computation.task.projectanalysis.source.linereader.SymbolsLineReader; import org.sonar.server.computation.task.step.ComputationStep; -import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class PersistFileSourcesStep implements ComputationStep { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistIssuesStep.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistIssuesStep.java index 3f4806f8554..6c6acff2867 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistIssuesStep.java @@ -17,9 +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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.issue.IssueCache; +import org.sonar.ce.task.projectanalysis.issue.RuleRepository; +import org.sonar.ce.task.projectanalysis.issue.UpdateConflictResolver; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.util.CloseableIterator; import org.sonar.db.DbClient; @@ -27,9 +30,9 @@ import org.sonar.db.DbSession; import org.sonar.db.issue.IssueChangeMapper; import org.sonar.db.issue.IssueDto; import org.sonar.db.issue.IssueMapper; -import org.sonar.server.computation.task.projectanalysis.issue.IssueCache; -import org.sonar.server.computation.task.projectanalysis.issue.RuleRepository; -import org.sonar.server.computation.task.projectanalysis.issue.UpdateConflictResolver; +import org.sonar.ce.task.projectanalysis.issue.IssueCache; +import org.sonar.ce.task.projectanalysis.issue.RuleRepository; +import org.sonar.ce.task.projectanalysis.issue.UpdateConflictResolver; import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.issue.IssueStorage; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistLiveMeasuresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistLiveMeasuresStep.java similarity index 82% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistLiveMeasuresStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistLiveMeasuresStep.java index aa84e147bb9..2d3c3a87c30 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistLiveMeasuresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistLiveMeasuresStep.java @@ -17,7 +17,7 @@ * along with this program; 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.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.collect.Multimap; import java.util.Collection; @@ -27,22 +27,22 @@ import java.util.Map; import java.util.Set; import java.util.function.Predicate; import javax.annotation.Nonnull; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.measure.BestValueOptimization; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.measure.MeasureToMeasureDto; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.core.util.Uuids; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.measure.LiveMeasureDao; import org.sonar.db.measure.LiveMeasureDto; -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 java.util.Arrays.asList; @@ -50,7 +50,7 @@ import static java.util.Collections.unmodifiableSet; 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.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class PersistLiveMeasuresStep implements ComputationStep { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistMeasuresStep.java similarity index 81% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistMeasuresStep.java index 9182da798c8..f4f9b5ed5aa 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Multimap; @@ -25,25 +25,25 @@ import java.util.Collection; import java.util.Map; import java.util.function.Predicate; import javax.annotation.Nonnull; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.measure.MeasureToMeasureDto; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.core.config.PurgeConstants; 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.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.component.ConfigurationRepository; -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.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 org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class PersistMeasuresStep implements ComputationStep { @@ -56,7 +56,7 @@ public class PersistMeasuresStep implements ComputationStep { public PersistMeasuresStep(DbClient dbClient, MetricRepository metricRepository, MeasureToMeasureDto measureToMeasureDto, TreeRootHolder treeRootHolder, MeasureRepository measureRepository, ConfigurationRepository settings) { - this(dbClient, metricRepository, measureToMeasureDto, treeRootHolder,measureRepository, + this(dbClient, metricRepository, measureToMeasureDto, treeRootHolder, measureRepository, !settings.getConfiguration().getBoolean(PurgeConstants.PROPERTY_CLEAN_DIRECTORY).orElseThrow(() -> new IllegalStateException("Missing default value"))); } diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistProjectLinksStep.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistProjectLinksStep.java index 0b4906b60db..9f0cfc61804 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.collect.ImmutableMap; import java.util.HashSet; @@ -25,16 +25,17 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.util.UuidFactory; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.component.ProjectLinkDto; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.ComponentLink.ComponentLinkType; -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.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.base.Preconditions.checkArgument; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistScannerContextStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStep.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistScannerContextStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStep.java index 4f5e5e532af..b70c23ec334 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistScannerContextStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStep.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.sonar.ce.queue.CeTask; import org.sonar.core.util.CloseableIterator; import org.sonar.db.DbClient; import org.sonar.db.DbSession; -import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; import org.sonar.server.computation.task.step.ComputationStep; import static java.util.Collections.singleton; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistTestsStep.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistTestsStep.java index 27fdd14ff30..3fb9fb410aa 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Joiner; import com.google.common.collect.ArrayListMultimap; @@ -35,6 +35,10 @@ import java.util.Set; import org.sonar.api.utils.System2; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ComponentVisitor; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; import org.sonar.core.util.CloseableIterator; import org.sonar.core.util.Uuids; import org.sonar.db.DbClient; @@ -44,13 +48,13 @@ 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.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.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ComponentVisitor; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; import org.sonar.server.computation.task.step.ComputationStep; public class PersistTestsStep implements ComputationStep { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PublishTaskResultStep.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PublishTaskResultStep.java index 2414393ec9a..6ab10894c89 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PublishTaskResultStep.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.Optional; import javax.annotation.concurrent.Immutable; import org.sonar.ce.queue.CeTaskResult; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.computation.taskprocessor.MutableTaskResultHolder; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PurgeDatastoresStep.java similarity index 72% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PurgeDatastoresStep.java index 9b2a85869ac..511f782cc93 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PurgeDatastoresStep.java @@ -17,25 +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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; +import org.sonar.ce.task.projectanalysis.component.DbIdsRepository; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.DisabledComponentsHolder; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.purge.IdUuidPair; -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.ConfigurationRepository; -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.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; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit.reportMaxDepth; public class PurgeDatastoresStep implements ComputationStep { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/QualityGateEventsStep.java similarity index 80% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/QualityGateEventsStep.java index d9bbf514fc5..0739d7cf267 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Optional; import javax.annotation.Nullable; @@ -25,21 +25,27 @@ 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.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; -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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ComponentVisitor; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ComponentVisitor; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.event.Event; +import org.sonar.ce.task.projectanalysis.event.EventRepository; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.measure.QualityGateStatus; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.notification.NotificationService; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/QualityGateMeasuresStep.java similarity index 81% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/QualityGateMeasuresStep.java index 8fce93dbe39..8bae1bff76a 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; @@ -33,34 +33,34 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.apache.commons.lang.StringUtils; import org.sonar.api.measures.CoreMetrics; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.measure.QualityGateStatus; +import org.sonar.ce.task.projectanalysis.measure.qualitygatedetails.EvaluatedCondition; +import org.sonar.ce.task.projectanalysis.measure.qualitygatedetails.QualityGateDetailsData; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.qualitygate.Condition; +import org.sonar.ce.task.projectanalysis.qualitygate.ConditionEvaluator; +import org.sonar.ce.task.projectanalysis.qualitygate.ConditionStatus; +import org.sonar.ce.task.projectanalysis.qualitygate.EvaluationResult; +import org.sonar.ce.task.projectanalysis.qualitygate.EvaluationResultTextConverter; +import org.sonar.ce.task.projectanalysis.qualitygate.MutableQualityGateStatusHolder; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGate; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateHolder; import org.sonar.core.util.stream.MoreCollectors; -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.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; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.ce.task.projectanalysis.qualitygate.ConditionStatus.NO_VALUE_STATUS; +import static org.sonar.ce.task.projectanalysis.qualitygate.ConditionStatus.create; /** * This step: @@ -140,14 +140,14 @@ public class QualityGateMeasuresStep implements ComputationStep { } } - private static org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateStatus convert(Measure.Level globalLevel) { + private static org.sonar.ce.task.projectanalysis.qualitygate.QualityGateStatus convert(Measure.Level globalLevel) { switch (globalLevel) { case OK: - return org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateStatus.OK; + return org.sonar.ce.task.projectanalysis.qualitygate.QualityGateStatus.OK; case WARN: - return org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateStatus.WARN; + return org.sonar.ce.task.projectanalysis.qualitygate.QualityGateStatus.WARN; case ERROR: - return org.sonar.server.computation.task.projectanalysis.qualitygate.QualityGateStatus.ERROR; + return org.sonar.ce.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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/QualityProfileEventsStep.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/QualityProfileEventsStep.java index b530e0abe22..c8b947d85c6 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSortedMap; @@ -29,23 +29,23 @@ import org.apache.commons.lang.time.DateUtils; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.resources.Language; import org.sonar.api.utils.KeyValueFormat; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.event.Event; +import org.sonar.ce.task.projectanalysis.event.EventRepository; +import org.sonar.ce.task.projectanalysis.language.LanguageRepository; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.core.util.UtcDateUtils; -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.step.ComputationStep; import org.sonar.server.qualityprofile.QPMeasureData; import org.sonar.server.qualityprofile.QualityProfile; -import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; /** * Computation of quality profile events diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationSteps.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ReportComputationSteps.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationSteps.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ReportComputationSteps.java index b28b1a144bd..27c367d9e18 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationSteps.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ReportComputationSteps.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.Arrays; import java.util.List; import org.sonar.server.computation.task.container.TaskContainer; -import org.sonar.server.computation.task.projectanalysis.filemove.FileMoveDetectionStep; +import org.sonar.ce.task.projectanalysis.filemove.FileMoveDetectionStep; import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.computation.task.step.ExecuteStatelessInitExtensionsStep; -import org.sonar.server.computation.task.projectanalysis.measure.PostMeasuresComputationChecksStep; +import org.sonar.ce.task.projectanalysis.measure.PostMeasuresComputationChecksStep; /** * Ordered list of steps classes and instances to be executed for batch processing diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStep.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStep.java index 04c90437dff..9f142add4dd 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -33,20 +33,20 @@ import java.util.function.Predicate; import javax.annotation.CheckForNull; import org.sonar.api.issue.Issue; import org.sonar.api.utils.Duration; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.issue.IssueCache; +import org.sonar.ce.task.projectanalysis.issue.RuleRepository; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.util.CloseableIterator; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.user.UserDto; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; -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.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; @@ -58,8 +58,8 @@ import org.sonar.server.notification.NotificationService; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static java.util.stream.StreamSupport.stream; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; import static org.sonar.db.component.BranchType.PULL_REQUEST; -import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; /** * Reads issues from disk cache and send related notifications. For performance reasons, diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SizeMeasuresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/SizeMeasuresStep.java similarity index 84% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SizeMeasuresStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/SizeMeasuresStep.java index 4ed2db87a67..083f04ead01 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SizeMeasuresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/SizeMeasuresStep.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Optional; import java.util.Arrays; import java.util.Collections; import java.util.List; -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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.PathAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.formula.Formula; +import org.sonar.ce.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.server.computation.task.step.ComputationStep; import static org.sonar.api.measures.CoreMetrics.CLASSES_KEY; @@ -45,9 +45,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.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; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.ce.task.projectanalysis.formula.SumFormula.createIntSumFormula; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; /** * Compute size measures diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SmallChangesetQualityGateSpecialCase.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/SmallChangesetQualityGateSpecialCase.java similarity index 81% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SmallChangesetQualityGateSpecialCase.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/SmallChangesetQualityGateSpecialCase.java index b799b3f0e2a..8aa32e1d9ca 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/SmallChangesetQualityGateSpecialCase.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/SmallChangesetQualityGateSpecialCase.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.Collection; import javax.annotation.Nullable; import org.sonar.api.measures.CoreMetrics; -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.MetricRepository; -import org.sonar.server.computation.task.projectanalysis.qualitygate.EvaluationResult; -import org.sonar.server.computation.task.projectanalysis.step.QualityGateMeasuresStep.MetricEvaluationResult; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.qualitygate.EvaluationResult; +import org.sonar.ce.task.projectanalysis.step.QualityGateMeasuresStep.MetricEvaluationResult; import static java.util.Arrays.asList; @@ -42,8 +42,7 @@ public class SmallChangesetQualityGateSpecialCase { CoreMetrics.NEW_BRANCH_COVERAGE_KEY, CoreMetrics.NEW_DUPLICATED_LINES_DENSITY_KEY, CoreMetrics.NEW_DUPLICATED_LINES_KEY, - CoreMetrics.NEW_BLOCKS_DUPLICATED_KEY - ); + CoreMetrics.NEW_BLOCKS_DUPLICATED_KEY); private static final int MAXIMUM_NEW_LINES_FOR_SMALL_CHANGESETS = 19; private final MeasureRepository measureRepository; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/TriggerViewRefreshStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/TriggerViewRefreshStep.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/TriggerViewRefreshStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/TriggerViewRefreshStep.java index fd397e13a28..ef5510026a6 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/TriggerViewRefreshStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/TriggerViewRefreshStep.java @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import javax.annotation.CheckForNull; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.task.projectanalysis.view.TriggerViewRefreshDelegate; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.view.TriggerViewRefreshDelegate; import org.sonar.server.computation.task.step.ComputationStep; /** diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UnitTestMeasuresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/UnitTestMeasuresStep.java similarity index 83% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UnitTestMeasuresStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/UnitTestMeasuresStep.java index 87253d0fef5..ac07bce66ff 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UnitTestMeasuresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/UnitTestMeasuresStep.java @@ -17,23 +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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; -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.formula.counter.IntSumCounter; -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.measure.MeasureRepository; -import org.sonar.server.computation.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.formula.Counter; +import org.sonar.ce.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.ce.task.projectanalysis.formula.Formula; +import org.sonar.ce.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.formula.Counter; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.task.projectanalysis.formula.CreateMeasureContext; +import org.sonar.ce.task.projectanalysis.formula.Formula; +import org.sonar.ce.task.projectanalysis.formula.FormulaExecutorComponentVisitor; +import org.sonar.ce.task.projectanalysis.formula.counter.IntSumCounter; +import org.sonar.ce.task.projectanalysis.formula.counter.LongSumCounter; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.server.computation.task.step.ComputationStep; import static org.sonar.api.measures.CoreMetrics.SKIPPED_TESTS_KEY; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStep.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStep.java index 238e6d28509..9cb2725243e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStep.java @@ -17,23 +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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Optional; import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.qualityprofile.QProfileDto; -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.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.qualityprofile.QPMeasureData; import org.sonar.server.qualityprofile.QualityProfile; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ValidateProjectStep.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ValidateProjectStep.java index 2624ee5e008..84f15aaf175 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Joiner; import com.google.common.base.Optional; @@ -26,20 +26,24 @@ import java.util.Date; import java.util.List; import java.util.Map; import org.sonar.api.utils.MessageException; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ComponentVisitor; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; import org.sonar.core.component.ComponentKeys; import org.sonar.db.DbClient; 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.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.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ComponentVisitor; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.FluentIterable.from; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/VerifyBillingStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/VerifyBillingStep.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/VerifyBillingStep.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/VerifyBillingStep.java index ee19e28815d..32c880c2190 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/step/VerifyBillingStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/VerifyBillingStep.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.sonar.api.utils.MessageException; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.task.projectanalysis.analysis.Organization; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.Organization; import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.organization.BillingValidations; import org.sonar.server.organization.BillingValidationsProxy; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/package-info.java new file mode 100644 index 00000000000..be671d25f3a --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.step; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/ReportTaskProcessor.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/taskprocessor/ReportTaskProcessor.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/ReportTaskProcessor.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/taskprocessor/ReportTaskProcessor.java index 574309168dc..dd1f14fb43c 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/ReportTaskProcessor.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/taskprocessor/ReportTaskProcessor.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.task.projectanalysis.taskprocessor; +package org.sonar.ce.task.projectanalysis.taskprocessor; import java.util.Collections; import java.util.Set; import javax.annotation.CheckForNull; import org.sonar.ce.queue.CeTask; import org.sonar.ce.queue.CeTaskResult; +import org.sonar.ce.task.projectanalysis.container.ContainerFactory; 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.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; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/taskprocessor/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/taskprocessor/package-info.java new file mode 100644 index 00000000000..c9ab7649b6b --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/taskprocessor/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.taskprocessor; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/view/TriggerViewRefreshDelegate.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/view/TriggerViewRefreshDelegate.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/view/TriggerViewRefreshDelegate.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/view/TriggerViewRefreshDelegate.java index 9ade436f8c6..0775e84242d 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/view/TriggerViewRefreshDelegate.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/view/TriggerViewRefreshDelegate.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.task.projectanalysis.view; +package org.sonar.ce.task.projectanalysis.view; import java.util.function.Consumer; import org.sonar.server.project.Project; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/view/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/view/package-info.java new file mode 100644 index 00000000000..285c54e6b5a --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/view/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.view; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTask.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/webhook/WebhookPostTask.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTask.java rename to server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/webhook/WebhookPostTask.java index e043b37fecf..a4262fc1cf9 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTask.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/webhook/WebhookPostTask.java @@ -17,7 +17,7 @@ * along with this program; 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.webhook; +package org.sonar.ce.task.projectanalysis.webhook; import java.util.Map; import java.util.Optional; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/webhook/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/webhook/package-info.java new file mode 100644 index 00000000000..2e0494408c3 --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/webhook/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info 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.ce.task.projectanalysis.webhook; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/package-info.java deleted file mode 100644 index 7e4e12fa1bd..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/package-info.java deleted file mode 100644 index 3a0d91bf7e1..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/api/posttask/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/package-info.java deleted file mode 100644 index 3232265dd20..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/component/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java deleted file mode 100644 index 5edf02fbeda..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java +++ /dev/null @@ -1,292 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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.organization.DefaultOrganizationLoader; -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.container.TaskContainer; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderImpl; -import org.sonar.server.computation.task.projectanalysis.api.posttask.PostProjectAnalysisTasksExecutor; -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.BranchLoader; -import org.sonar.server.computation.task.projectanalysis.component.BranchPersisterImpl; -import org.sonar.server.computation.task.projectanalysis.component.ConfigurationRepositoryImpl; -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.MergeBranchComponentUuids; -import org.sonar.server.computation.task.projectanalysis.component.ShortBranchComponentsWithIssues; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderImpl; -import org.sonar.server.computation.task.projectanalysis.dbmigration.DbMigrationModule; -import org.sonar.server.computation.task.projectanalysis.duplication.CrossProjectDuplicationStatusHolderImpl; -import org.sonar.server.computation.task.projectanalysis.duplication.DuplicationMeasures; -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.ScoreMatrixDumperImpl; -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.ComponentIssuesLoader; -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.IssueCreationDateCalculator; -import org.sonar.server.computation.task.projectanalysis.issue.IssueLifecycle; -import org.sonar.server.computation.task.projectanalysis.issue.IssueTrackingDelegator; -import org.sonar.server.computation.task.projectanalysis.issue.IssueVisitors; -import org.sonar.server.computation.task.projectanalysis.issue.IssuesRepositoryVisitor; -import org.sonar.server.computation.task.projectanalysis.issue.LoadComponentUuidsHavingOpenIssuesVisitor; -import org.sonar.server.computation.task.projectanalysis.issue.MergeBranchTrackerExecution; -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.RemoveProcessedComponentsVisitor; -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.ShortBranchIssueMerger; -import org.sonar.server.computation.task.projectanalysis.issue.ShortBranchIssuesLoader; -import org.sonar.server.computation.task.projectanalysis.issue.ShortBranchTrackerExecution; -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.TrackerMergeBranchInputFactory; -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.PeriodHolderImpl; -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.MaintainabilityMeasuresVisitor; -import org.sonar.server.computation.task.projectanalysis.qualitymodel.NewMaintainabilityMeasuresVisitor; -import org.sonar.server.computation.task.projectanalysis.qualitymodel.NewReliabilityAndSecurityRatingMeasuresVisitor; -import org.sonar.server.computation.task.projectanalysis.qualitymodel.RatingSettings; -import org.sonar.server.computation.task.projectanalysis.qualitymodel.ReliabilityAndSecurityRatingMeasuresVisitor; -import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolderImpl; -import org.sonar.server.computation.task.projectanalysis.scm.ScmInfoDbLoader; -import org.sonar.server.computation.task.projectanalysis.scm.ScmInfoRepositoryImpl; -import org.sonar.server.computation.task.projectanalysis.source.DbLineHashVersion; -import org.sonar.server.computation.task.projectanalysis.source.LastCommitVisitor; -import org.sonar.server.computation.task.projectanalysis.source.SignificantCodeRepository; -import org.sonar.server.computation.task.projectanalysis.source.SourceHashRepositoryImpl; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesDiffImpl; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesHashCache; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesHashRepositoryImpl; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesRepositoryImpl; -import org.sonar.server.computation.task.projectanalysis.step.ReportComputationSteps; -import org.sonar.server.computation.task.projectanalysis.step.SmallChangesetQualityGateSpecialCase; -import org.sonar.server.computation.task.projectanalysis.webhook.WebhookPostTask; -import org.sonar.server.computation.task.step.ComputationStepExecutor; -import org.sonar.server.computation.task.step.ComputationSteps; -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(DefaultOrganizationLoader.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(), - - DbMigrationModule.class, - - MetricModule.class, - - // holders - AnalysisMetadataHolderImpl.class, - CrossProjectDuplicationStatusHolderImpl.class, - BatchReportDirectoryHolderImpl.class, - TreeRootHolderImpl.class, - PeriodHolderImpl.class, - QualityGateHolderImpl.class, - QualityGateStatusHolderImpl.class, - RatingSettings.class, - ActiveRulesHolderImpl.class, - MeasureComputersHolderImpl.class, - MutableTaskResultHolderImpl.class, - BatchReportReaderImpl.class, - MergeBranchComponentUuids.class, - ShortBranchComponentsWithIssues.class, - - // repositories - LanguageRepositoryImpl.class, - MeasureRepositoryImpl.class, - EventRepositoryImpl.class, - ConfigurationRepositoryImpl.class, - DbIdsRepositoryImpl.class, - DisabledComponentsHolderImpl.class, - QualityGateServiceImpl.class, - EvaluationResultTextConverterImpl.class, - SourceLinesRepositoryImpl.class, - SourceHashRepositoryImpl.class, - SourceLinesDiffImpl.class, - ScmInfoRepositoryImpl.class, - ScmInfoDbLoader.class, - DuplicationRepositoryImpl.class, - SourceLinesHashRepositoryImpl.class, - DbLineHashVersion.class, - SignificantCodeRepository.class, - SourceLinesHashCache.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, - IssueCreationDateCalculator.class, - DebtCalculator.class, - EffortAggregator.class, - NewEffortAggregator.class, - IssueAssigner.class, - IssueCounter.class, - MovedIssueVisitor.class, - IssuesRepositoryVisitor.class, - RemoveProcessedComponentsVisitor.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, - MaintainabilityMeasuresVisitor.class, - NewMaintainabilityMeasuresVisitor.class, - ReliabilityAndSecurityRatingMeasuresVisitor.class, - NewReliabilityAndSecurityRatingMeasuresVisitor.class, - LastCommitVisitor.class, - MeasureComputersVisitor.class, - - UpdateConflictResolver.class, - TrackerBaseInputFactory.class, - TrackerRawInputFactory.class, - TrackerMergeBranchInputFactory.class, - Tracker.class, - TrackerExecution.class, - ShortBranchTrackerExecution.class, - MergeBranchTrackerExecution.class, - ComponentIssuesLoader.class, - BaseIssuesLoader.class, - IssueTrackingDelegator.class, - BranchPersisterImpl.class, - ShortBranchIssuesLoader.class, - ShortBranchIssueMerger.class, - - // filemove - ScoreMatrixDumperImpl.class, - SourceSimilarityImpl.class, - FileSimilarityImpl.class, - MutableMovedFilesRepositoryImpl.class, - - // duplication - IntegrateCrossProjectDuplications.class, - DuplicationMeasures.class, - - // views - ViewIndex.class, - - BranchLoader.class, - MeasureToMeasureDto.class, - SmallChangesetQualityGateSpecialCase.class, - - // webhooks - WebhookPostTask.class); - } - -} diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/container/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/container/package-info.java deleted file mode 100644 index 058ec55cc23..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/container/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/package-info.java deleted file mode 100644 index 25c33db2ddf..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/dbmigration/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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.dbmigration; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/package-info.java deleted file mode 100644 index 85b6a718edd..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/event/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/event/package-info.java deleted file mode 100644 index 8fa6ec31833..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/event/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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.event; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/package-info.java deleted file mode 100644 index fe16d9740e3..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/package-info.java deleted file mode 100644 index 1cf2581f7bd..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/filesystem/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/package-info.java deleted file mode 100644 index 80e3da211b6..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/counter/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/package-info.java deleted file mode 100644 index 3a1175d13dc..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/package-info.java deleted file mode 100644 index 99a2ce6b870..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/formula/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/package-info.java deleted file mode 100644 index 79128a7f1c5..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/package-info.java deleted file mode 100644 index 22fde9a0461..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/filter/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/package-info.java deleted file mode 100644 index 9ec787cb12b..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/language/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/language/package-info.java deleted file mode 100644 index f202938ac9f..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/language/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/package-info.java deleted file mode 100644 index ab4c186df28..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/package-info.java deleted file mode 100644 index 47886fe2e0d..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/package-info.java deleted file mode 100644 index 97c8de83d09..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/period/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/period/package-info.java deleted file mode 100644 index e7eab9fdd21..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/period/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/package-info.java deleted file mode 100644 index 154cdb6587e..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitygate/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/package-info.java deleted file mode 100644 index da37360558a..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/package-info.java deleted file mode 100644 index 177464a116e..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/package-info.java deleted file mode 100644 index 8cb1be4a093..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/linereader/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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.linereader; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/package-info.java deleted file mode 100644 index 169cf1e0156..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/source/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/package-info.java deleted file mode 100644 index c970b585d3c..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/taskprocessor/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/package-info.java deleted file mode 100644 index f62906b92e8..00000000000 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/server/computation/task/projectanalysis/webhook/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info 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.webhook; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/AnalysisImplTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/AnalysisImplTest.java index ab8414fd728..970f5b6d294 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.analysis; +package org.sonar.ce.task.projectanalysis.analysis; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/AnalysisMetadataHolderImplTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/AnalysisMetadataHolderImplTest.java index a5971cad4f4..d5084ce526c 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/AnalysisMetadataHolderImplTest.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.task.projectanalysis.analysis; +package org.sonar.ce.task.projectanalysis.analysis; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.sonar.ce.task.projectanalysis.component.DefaultBranchImpl; import org.sonar.db.component.BranchType; import org.sonar.db.organization.OrganizationDto; -import org.sonar.server.computation.task.projectanalysis.component.DefaultBranchImpl; import org.sonar.server.project.Project; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/AnalysisMetadataHolderRule.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/AnalysisMetadataHolderRule.java index b9f445316cd..bbb6d8d85ca 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/AnalysisMetadataHolderRule.java @@ -17,7 +17,7 @@ * along with this program; 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.analysis; +package org.sonar.ce.task.projectanalysis.analysis; import java.util.Date; import java.util.Map; @@ -81,7 +81,8 @@ public class AnalysisMetadataHolderRule extends ExternalResource implements Muta public AnalysisMetadataHolderRule setOrganizationUuid(String uuid, String defaultQualityGateUuid) { requireNonNull(uuid, "organization uuid can't be null"); - this.organization.setProperty(Organization.from(new OrganizationDto().setUuid(uuid).setKey("key_" + uuid).setName("name_" + uuid).setDefaultQualityGateUuid(defaultQualityGateUuid))); + this.organization + .setProperty(Organization.from(new OrganizationDto().setUuid(uuid).setKey("key_" + uuid).setName("name_" + uuid).setDefaultQualityGateUuid(defaultQualityGateUuid))); return this; } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolderRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/MutableAnalysisMetadataHolderRule.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolderRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/MutableAnalysisMetadataHolderRule.java index a3181b811e9..fe0a2b0ebfa 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/MutableAnalysisMetadataHolderRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/MutableAnalysisMetadataHolderRule.java @@ -17,7 +17,7 @@ * along with this program; 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.analysis; +package org.sonar.ce.task.projectanalysis.analysis; import java.util.Map; import javax.annotation.CheckForNull; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/OrganizationTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/OrganizationTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/OrganizationTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/OrganizationTest.java index 9699cd6d654..5a521c9d843 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/OrganizationTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/OrganizationTest.java @@ -17,7 +17,7 @@ * along with this program; 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.analysis; +package org.sonar.ce.task.projectanalysis.analysis; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/ProjectConfigurationFactoryTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/ProjectConfigurationFactoryTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/ProjectConfigurationFactoryTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/ProjectConfigurationFactoryTest.java index a03901e726a..106eb103aaf 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/ProjectConfigurationFactoryTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/ProjectConfigurationFactoryTest.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.task.projectanalysis.analysis; +package org.sonar.ce.task.projectanalysis.analysis; import org.junit.Rule; import org.junit.Test; import org.sonar.api.config.Configuration; import org.sonar.api.config.internal.MapSettings; +import org.sonar.ce.task.projectanalysis.component.DefaultBranchImpl; import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; -import org.sonar.server.computation.task.projectanalysis.component.DefaultBranchImpl; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/ScannerPluginTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/ScannerPluginTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/ScannerPluginTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/ScannerPluginTest.java index 6fbbb3ff50d..216a3e204d8 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/ScannerPluginTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/analysis/ScannerPluginTest.java @@ -17,7 +17,7 @@ * along with this program; 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.analysis; +package org.sonar.ce.task.projectanalysis.analysis; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/ComponentImplTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/ComponentImplTest.java index c7e674c9a2f..13b59b60c3c 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.api.measurecomputer; +package org.sonar.ce.task.projectanalysis.api.measurecomputer; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java index d6f967d3f9e..af5e394d745 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.api.measurecomputer; +package org.sonar.ce.task.projectanalysis.api.measurecomputer; import com.google.common.base.Optional; import java.util.Arrays; @@ -32,15 +32,15 @@ import org.sonar.api.config.internal.MapSettings; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.Duration; +import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.issue.ComponentIssuesRepositoryRule; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricImpl; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.task.projectanalysis.component.ConfigurationRepository; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; -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; @@ -48,8 +48,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.task.projectanalysis.component.ReportComponent.builder; -import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; public class MeasureComputerContextImplTest { @@ -67,17 +67,17 @@ 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.task.projectanalysis.component.Component FILE_1 = builder( - org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE, FILE_1_REF) + private static final org.sonar.ce.task.projectanalysis.component.Component FILE_1 = builder( + org.sonar.ce.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.task.projectanalysis.component.Component.Type.PROJECT, PROJECT_REF).setKey("project") + .setRoot(builder(org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT, PROJECT_REF).setKey("project") .addChildren( FILE_1, - builder(org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE, FILE_2_REF).setKey("fileKey2").build()) + builder(org.sonar.ce.task.projectanalysis.component.Component.Type.FILE, FILE_2_REF).setKey("fileKey2").build()) .build()); @Rule diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java index 2aa5a01863b..516a7fd3853 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.api.measurecomputer; +package org.sonar.ce.task.projectanalysis.api.measurecomputer; import org.junit.Rule; import org.junit.Test; @@ -82,7 +82,7 @@ public class MeasureComputerDefinitionImplTest { thrown.expectMessage("Input metrics cannot be null"); new MeasureComputerDefinitionImpl.BuilderImpl() - .setInputMetrics((String[])null) + .setInputMetrics((String[]) null) .setOutputMetrics("comment_density_1", "comment_density_2"); } @@ -113,7 +113,7 @@ public class MeasureComputerDefinitionImplTest { new MeasureComputerDefinitionImpl.BuilderImpl() .setInputMetrics("ncloc", "comment") - .setOutputMetrics((String[])null); + .setOutputMetrics((String[]) null); } @Test @@ -169,7 +169,7 @@ public class MeasureComputerDefinitionImplTest { .setInputMetrics("ncloc", "comment") .setOutputMetrics("comment_density_1", "comment_density_2") .build().toString()) - .isEqualTo("MeasureComputerDefinitionImpl{inputMetricKeys=[ncloc, comment], outputMetrics=[comment_density_1, comment_density_2]}"); + .isEqualTo("MeasureComputerDefinitionImpl{inputMetricKeys=[ncloc, comment], outputMetrics=[comment_density_1, comment_density_2]}"); } } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/MeasureImplTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/measurecomputer/MeasureImplTest.java index 3e52a313c54..e02fddee36a 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.api.measurecomputer; +package org.sonar.ce.task.projectanalysis.api.measurecomputer; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.Measure; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/CeTaskImplTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/CeTaskImplTest.java index e6fbd060f45..ba3e3e24ca1 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/CeTaskImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.api.posttask; +package org.sonar.ce.task.projectanalysis.api.posttask; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/ConditionImplTest.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/ConditionImplTest.java index 457b5f8123c..449153abd24 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.api.posttask; +package org.sonar.ce.task.projectanalysis.api.posttask; import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; @@ -150,7 +150,7 @@ public class ConditionImplTest { assertThat(builder.build().toString()) .isEqualTo( - "ConditionImpl{status=NO_VALUE, metricKey='metricKey', operator=GREATER_THAN, errorThreshold='error threshold', warningThreshold='warn threshold', onLeakPeriod=true, value='null'}"); + "ConditionImpl{status=NO_VALUE, metricKey='metricKey', operator=GREATER_THAN, errorThreshold='error threshold', warningThreshold='warn threshold', onLeakPeriod=true, value='null'}"); } @Test diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToConditionTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/ConditionToConditionTest.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToConditionTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/ConditionToConditionTest.java index b2b95d495e9..f5e530b700c 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ConditionToConditionTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.api.posttask; +package org.sonar.ce.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.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.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.qualitygate.Condition; +import org.sonar.ce.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-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java index ce56b6e5869..225bf1f698b 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.api.posttask; +package org.sonar.ce.task.projectanalysis.api.posttask; import com.google.common.collect.ImmutableMap; import com.tngtech.java.junit.dataprovider.DataProvider; @@ -39,21 +39,21 @@ import org.sonar.api.ce.posttask.PostProjectAnalysisTask; import org.sonar.api.ce.posttask.Project; import org.sonar.api.utils.System2; import org.sonar.ce.queue.CeTask; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.analysis.Organization; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.DefaultBranchImpl; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.qualitygate.Condition; +import org.sonar.ce.task.projectanalysis.qualitygate.ConditionStatus; +import org.sonar.ce.task.projectanalysis.qualitygate.MutableQualityGateHolderRule; +import org.sonar.ce.task.projectanalysis.qualitygate.MutableQualityGateStatusHolderRule; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGate; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateStatus; import org.sonar.db.component.BranchType; import org.sonar.db.organization.OrganizationDto; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; -import org.sonar.server.computation.task.projectanalysis.analysis.Organization; -import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; -import org.sonar.server.computation.task.projectanalysis.component.DefaultBranchImpl; -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 java.util.Arrays.asList; @@ -113,7 +113,7 @@ public class PostProjectAnalysisTasksExecutorTest { .setBranch(branch) .setOrganizationsEnabled(new Random().nextBoolean()) .setOrganization(Organization.from( - new OrganizationDto().setKey(organizationKey).setName(organizationName).setUuid(organizationUuid).setDefaultQualityGateUuid("foo"))); + new OrganizationDto().setKey(organizationKey).setName(organizationName).setUuid(organizationUuid).setDefaultQualityGateUuid("foo"))); } @Test @@ -133,7 +133,7 @@ public class PostProjectAnalysisTasksExecutorTest { new PostProjectAnalysisTasksExecutor( ceTask, analysisMetadataHolder, qualityGateHolder, qualityGateStatusHolder, reportReader, system2, new PostProjectAnalysisTask[] {postProjectAnalysisTask1, postProjectAnalysisTask2}) - .finished(allStepsExecuted); + .finished(allStepsExecuted); inOrder.verify(postProjectAnalysisTask1).finished(projectAnalysisArgumentCaptor.capture()); inOrder.verify(postProjectAnalysisTask2).finished(projectAnalysisArgumentCaptor.capture()); @@ -150,7 +150,7 @@ public class PostProjectAnalysisTasksExecutorTest { analysisMetadataHolder .setOrganizationsEnabled(false) .setOrganization(Organization.from( - new OrganizationDto().setKey(organizationKey).setName(organizationName).setUuid(organizationUuid).setDefaultQualityGateUuid("foo"))); + new OrganizationDto().setKey(organizationKey).setName(organizationName).setUuid(organizationUuid).setDefaultQualityGateUuid("foo"))); underTest.finished(allStepsExecuted); verify(postProjectAnalysisTask).finished(projectAnalysisArgumentCaptor.capture()); @@ -164,7 +164,7 @@ public class PostProjectAnalysisTasksExecutorTest { analysisMetadataHolder .setOrganizationsEnabled(true) .setOrganization(Organization.from( - new OrganizationDto().setKey(organizationKey).setName(organizationName).setUuid(organizationUuid).setDefaultQualityGateUuid("foo"))); + new OrganizationDto().setKey(organizationKey).setName(organizationName).setUuid(organizationUuid).setDefaultQualityGateUuid("foo"))); underTest.finished(allStepsExecuted); verify(postProjectAnalysisTask).finished(projectAnalysisArgumentCaptor.capture()); @@ -370,7 +370,7 @@ public class PostProjectAnalysisTasksExecutorTest { new PostProjectAnalysisTasksExecutor( ceTask, analysisMetadataHolder, qualityGateHolder, qualityGateStatusHolder, reportReader, system2, new PostProjectAnalysisTask[] {postProjectAnalysisTask1, postProjectAnalysisTask2, postProjectAnalysisTask3}) - .finished(allStepsExecuted); + .finished(allStepsExecuted); inOrder.verify(postProjectAnalysisTask1).finished(projectAnalysisArgumentCaptor.capture()); inOrder.verify(postProjectAnalysisTask2).finished(projectAnalysisArgumentCaptor.capture()); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/ProjectImplTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/ProjectImplTest.java index 871aa876b52..8622244b426 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/ProjectImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.api.posttask; +package org.sonar.ce.task.projectanalysis.api.posttask; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/QualityGateImplTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/QualityGateImplTest.java index 348b00dd558..dae2484d8c5 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.api.posttask; +package org.sonar.ce.task.projectanalysis.api.posttask; import com.google.common.collect.ImmutableList; import java.util.Collections; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/batch/BatchReportDirectoryHolderImplTest.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/batch/BatchReportDirectoryHolderImplTest.java index 2f932b5f8cc..39987b60eb3 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportDirectoryHolderImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.batch; +package org.sonar.ce.task.projectanalysis.batch; import java.io.File; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/batch/BatchReportReaderImplTest.java similarity index 99% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/batch/BatchReportReaderImplTest.java index 0a98aff5850..38c103d23da 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.batch; +package org.sonar.ce.task.projectanalysis.batch; import java.io.File; import java.io.IOException; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/batch/BatchReportReaderRule.java similarity index 99% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/batch/BatchReportReaderRule.java index c428cc00a20..2b4b234c32c 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.batch; +package org.sonar.ce.task.projectanalysis.batch; import com.google.common.base.Preconditions; import java.util.ArrayList; @@ -172,7 +172,7 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader { public CloseableIterator readComponentIssues(int componentRef) { return closeableIterator(issues.get(componentRef)); } - + @Override public CloseableIterator readComponentExternalIssues(int componentRef) { return closeableIterator(externalIssues.get(componentRef)); @@ -182,7 +182,7 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader { this.issues.put(componentRef, issues); return this; } - + public BatchReportReaderRule putExternalIssues(int componentRef, List externalIssues) { this.externalIssues.put(componentRef, externalIssues); return this; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/ImmutableBatchReportDirectoryHolder.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/batch/ImmutableBatchReportDirectoryHolder.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/ImmutableBatchReportDirectoryHolder.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/batch/ImmutableBatchReportDirectoryHolder.java index 22ac18147e2..00432fe1f2c 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/ImmutableBatchReportDirectoryHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.batch; +package org.sonar.ce.task.projectanalysis.batch; import java.io.File; import java.util.Objects; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/AbstractComponentProvider.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/AbstractComponentProvider.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/AbstractComponentProvider.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/AbstractComponentProvider.java index 8dbc0c5eca1..1dee0ffe2a6 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/AbstractComponentProvider.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import static com.google.common.base.Preconditions.checkState; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/BranchLoaderTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/BranchLoaderTest.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/BranchLoaderTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/BranchLoaderTest.java index 5240e6d708e..820b1c53f14 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/BranchLoaderTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/BranchLoaderTest.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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.utils.MessageException; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.analysis.Branch; import org.sonar.db.component.BranchDto; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/BranchPersisterImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/BranchPersisterImplTest.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/BranchPersisterImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/BranchPersisterImplTest.java index 80a1a8e8b57..6cf1c26a2f2 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/BranchPersisterImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/BranchPersisterImplTest.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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.Optional; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.analysis.Branch; import org.sonar.db.DbTester; import org.sonar.db.component.BranchType; import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentTesting; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; import org.sonar.server.project.Project; 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.task.projectanalysis.component.Component.Type.PROJECT; -import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; public class BranchPersisterImplTest { private final static Component MAIN = builder(PROJECT, 1).setUuid("PROJECT_UUID").setKey("PROJECT_KEY").build(); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecord.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/CallRecord.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecord.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/CallRecord.java index 6faf1e596b0..216149cc1a2 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecord.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.Objects; import javax.annotation.CheckForNull; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderPathAwareVisitor.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/CallRecorderPathAwareVisitor.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderPathAwareVisitor.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/CallRecorderPathAwareVisitor.java index e267de3c777..84a56af2277 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderPathAwareVisitor.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import com.google.common.base.Function; import java.util.ArrayList; @@ -82,12 +82,12 @@ class CallRecorderPathAwareVisitor extends PathAwareVisitorAdapter { private static PathAwareCallRecord reportCallRecord(Component component, Path path, String method) { return PathAwareCallRecord.reportCallRecord(method, component.getReportAttributes().getRef(), path.current(), getParent(path), path.root(), - toValueList(path)); + toValueList(path)); } private static PathAwareCallRecord viewsCallRecord(Component component, Path path, String method) { return PathAwareCallRecord.viewsCallRecord(method, component.getKey(), path.current(), getParent(path), path.root(), - toValueList(path)); + toValueList(path)); } private static List toValueList(Path path) { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderTypeAwareVisitor.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/CallRecorderTypeAwareVisitor.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderTypeAwareVisitor.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/CallRecorderTypeAwareVisitor.java index f6e38b607c5..3974f9cecee 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CallRecorderTypeAwareVisitor.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.ArrayList; import java.util.List; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctionsTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentFunctionsTest.java similarity index 79% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctionsTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentFunctionsTest.java index a3880c8cc18..617e0e2afbd 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentFunctionsTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentFunctionsTest.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.task.projectanalysis.component; +package org.sonar.ce.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.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.ComponentFunctions.toReportRef; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ComponentFunctions.toReportRef; public class ComponentFunctionsTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentImplTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentImplTest.java index c4921b8e68e..d23a0e4baa4 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentImplTest.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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.Arrays; import java.util.Collections; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.server.computation.task.projectanalysis.component.Component.Status; +import org.sonar.ce.task.projectanalysis.component.Component.Status; import static com.google.common.base.Strings.repeat; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; -import static org.sonar.server.computation.task.projectanalysis.component.ComponentImpl.builder; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.ComponentImpl.builder; public class ComponentImplTest { @@ -178,7 +178,7 @@ public class ComponentImplTest { .setName(veryLongString) .build(); - String expectedName = repeat("a", 500-3) + "..."; + String expectedName = repeat("a", 500 - 3) + "..."; assertThat(underTest.getName()).isEqualTo(expectedName); } @@ -190,7 +190,7 @@ public class ComponentImplTest { .setDescription(veryLongString) .build(); - String expectedDescription = repeat("a", 2_000-3) + "..."; + String expectedDescription = repeat("a", 2_000 - 3) + "..."; assertThat(underTest.getDescription()).isEqualTo(expectedDescription); } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentProvider.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentProvider.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentProvider.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentProvider.java index d708709b699..56f70258f9e 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentProvider.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; public interface ComponentProvider { /** diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentTest.java similarity index 82% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentTest.java index 4ec6d11c3f5..7275eb41994 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.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.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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; public class ComponentTest { @Test diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTreeBuilderTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentTreeBuilderTest.java similarity index 99% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTreeBuilderTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentTreeBuilderTest.java index a140b43050f..5cc30eff7ed 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTreeBuilderTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentTreeBuilderTest.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.Arrays; import java.util.EnumSet; @@ -34,7 +34,7 @@ import org.mockito.Mockito; import org.sonar.core.component.ComponentKeys; import org.sonar.db.component.SnapshotDto; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.analysis.Branch; import org.sonar.server.project.Project; import static com.google.common.base.Preconditions.checkArgument; @@ -48,7 +48,7 @@ import static org.sonar.scanner.protocol.output.ScannerReport.Component.Componen import static org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType.PROJECT; import static org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType.UNRECOGNIZED; import static org.sonar.scanner.protocol.output.ScannerReport.Component.newBuilder; -import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ComponentTreeBuilderTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentUuidFactoryTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentUuidFactoryTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentUuidFactoryTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentUuidFactoryTest.java index c9bb901700c..3b16e005173 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentUuidFactoryTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentUuidFactoryTest.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ConfigurationRepositoryTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ConfigurationRepositoryTest.java index 7255a761b39..edf912d9b64 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ConfigurationRepositoryTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ConfigurationRepositoryTest.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import org.junit.Before; import org.junit.Rule; @@ -25,13 +25,13 @@ import org.junit.Test; import org.sonar.api.config.Configuration; import org.sonar.api.config.internal.MapSettings; import org.sonar.api.utils.System2; -import org.sonar.server.computation.task.projectanalysis.analysis.ProjectConfigurationFactory; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.analysis.ProjectConfigurationFactory; import org.sonar.db.DbClient; import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; import org.sonar.db.property.PropertyDto; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; import org.sonar.server.project.Project; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimitTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/CrawlerDepthLimitTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimitTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/CrawlerDepthLimitTest.java index 75843f1e235..8d39aed26ef 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/CrawlerDepthLimitTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.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.task.projectanalysis.component.Component.Type; +import org.sonar.ce.task.projectanalysis.component.Component.Type; import static com.google.common.base.Predicates.equalTo; import static com.google.common.base.Predicates.in; @@ -345,7 +345,7 @@ public class CrawlerDepthLimitTest { @Nullable @Override public Object[] apply(Type input) { - return new Object[]{input}; + return new Object[] {input}; } }).toArray(Object[].class); } @@ -356,7 +356,7 @@ public class CrawlerDepthLimitTest { @Nullable @Override public Object[] apply(Type input) { - return new Object[]{input}; + return new Object[] {input}; } }).toArray(Object[].class); } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/DbIdsRepositoryImplTest.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/DbIdsRepositoryImplTest.java index 250116599bb..842b8f931cd 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DbIdsRepositoryImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.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.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; public class DbIdsRepositoryImplTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DefaultBranchImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/DefaultBranchImplTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DefaultBranchImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/DefaultBranchImplTest.java index e1fcf969e14..34f59abc446 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DefaultBranchImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/DefaultBranchImplTest.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import javax.annotation.Nullable; import org.junit.Rule; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/DisabledComponentsHolderImplTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/DisabledComponentsHolderImplTest.java index eda74f36f44..f01446f5904 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DisabledComponentsHolderImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DumbDeveloper.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/DumbDeveloper.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DumbDeveloper.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/DumbDeveloper.java index da7d9e1c1c9..eaaaadee551 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/DumbDeveloper.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; /** * Implementation od {@link Developer} only used for test diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributesTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/FileAttributesTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributesTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/FileAttributesTest.java index 211a7b856ac..6065f36236f 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributesTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/FileAttributesTest.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MergeBranchComponentUuidsTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/MergeBranchComponentUuidsTest.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MergeBranchComponentUuidsTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/MergeBranchComponentUuidsTest.java index ab6995c9c16..76ad6dff525 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MergeBranchComponentUuidsTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/MergeBranchComponentUuidsTest.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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.Optional; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.analysis.Branch; import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentTesting; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepositoryRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/MutableDbIdsRepositoryRule.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepositoryRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/MutableDbIdsRepositoryRule.java index 3b9c6cfa44c..5f141c0ec00 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepositoryRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/MutableDbIdsRepositoryRule.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import com.google.common.base.Function; import javax.annotation.Nullable; @@ -66,6 +66,7 @@ public class MutableDbIdsRepositoryRule extends ExternalResource implements Muta this.componentProvider.ensureInitialized(); return delegate.setComponentId(componentProvider.getByRef(componentRef), componentId); } + @Override public DbIdsRepository setComponentId(Component component, long componentId) { return delegate.setComponentId(component, componentId); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolderRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/MutableTreeRootHolderRule.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolderRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/MutableTreeRootHolderRule.java index ebdc508fd7c..3c0a7015de2 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableTreeRootHolderRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/MutableTreeRootHolderRule.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; public class MutableTreeRootHolderRule extends TreeRootHolderRule implements MutableTreeRootHolder { @Override diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/NoComponentProvider.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/NoComponentProvider.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/NoComponentProvider.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/NoComponentProvider.java index e648376be75..f0d70cd24f3 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/NoComponentProvider.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; public enum NoComponentProvider implements ComponentProvider { INSTANCE; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCallRecord.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/PathAwareCallRecord.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCallRecord.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/PathAwareCallRecord.java index 7d2848a9cb2..bedcb3e81f4 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/PathAwareCallRecord.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.List; import java.util.Objects; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportComponent.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ReportComponent.java similarity index 99% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportComponent.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ReportComponent.java index c4efee9f6f1..b7c001fe5bc 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportComponent.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import com.google.common.collect.ImmutableList; import java.util.ArrayList; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPathAwareVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ReportPathAwareVisitorTest.java similarity index 87% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPathAwareVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ReportPathAwareVisitorTest.java index f813b2b1a36..1da53eb1e09 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPathAwareVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.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.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; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ReportPathAwareVisitorTest { @@ -43,13 +43,11 @@ public class ReportPathAwareVisitorTest { ReportComponent.builder(DIRECTORY, 111) .addChildren( ReportComponent.builder(FILE, 1111).build(), - ReportComponent.builder(FILE, 1112).build() - ) + ReportComponent.builder(FILE, 1112).build()) .build(), ReportComponent.builder(DIRECTORY, 112) .addChildren( - ReportComponent.builder(FILE, 1121).build() - ) + ReportComponent.builder(FILE, 1121).build()) .build()) .build(), ReportComponent.builder(MODULE, 12) @@ -58,12 +56,11 @@ public class ReportPathAwareVisitorTest { .addChildren( ReportComponent.builder(DIRECTORY, 1211) .addChildren( - ReportComponent.builder(FILE, 12111).build() - ) - .build() - ).build() - ).build() - ).build(); + ReportComponent.builder(FILE, 12111).build()) + .build()) + .build()) + .build()) + .build(); @Test public void verify_preOrder_visit_call_when_visit_tree_with_depth_FILE() { @@ -92,8 +89,7 @@ public class ReportPathAwareVisitorTest { newCallRecord("visitAny", 1211, 121, of(1211, 121, 12, 1)), newCallRecord("visitDirectory", 1211, 121, of(1211, 121, 12, 1)), newCallRecord("visitAny", 12111, 1211, of(12111, 1211, 121, 12, 1)), - newCallRecord("visitFile", 12111, 1211, of(12111, 1211, 121, 12, 1)) - ).iterator(); + newCallRecord("visitFile", 12111, 1211, of(12111, 1211, 121, 12, 1))).iterator(); verifyCallRecords(expected, underTest.callsRecords.iterator()); } @@ -116,8 +112,7 @@ public class ReportPathAwareVisitorTest { newCallRecord("visitAny", 121, 12, of(121, 12, 1)), newCallRecord("visitModule", 121, 12, of(121, 12, 1)), newCallRecord("visitAny", 1211, 121, of(1211, 121, 12, 1)), - newCallRecord("visitDirectory", 1211, 121, of(1211, 121, 12, 1)) - ).iterator(); + newCallRecord("visitDirectory", 1211, 121, of(1211, 121, 12, 1))).iterator(); verifyCallRecords(expected, underTest.callsRecords.iterator()); } @@ -134,8 +129,7 @@ public class ReportPathAwareVisitorTest { newCallRecord("visitAny", 12, 1, of(12, 1)), newCallRecord("visitModule", 12, 1, of(12, 1)), newCallRecord("visitAny", 121, 12, of(121, 12, 1)), - newCallRecord("visitModule", 121, 12, of(121, 12, 1)) - ).iterator(); + newCallRecord("visitModule", 121, 12, of(121, 12, 1))).iterator(); verifyCallRecords(expected, underTest.callsRecords.iterator()); } @@ -146,8 +140,7 @@ public class ReportPathAwareVisitorTest { Iterator expected = of( newCallRecord("visitAny", 1, null, of(1)), - newCallRecord("visitProject", 1, null, of(1)) - ).iterator(); + newCallRecord("visitProject", 1, null, of(1))).iterator(); verifyCallRecords(expected, underTest.callsRecords.iterator()); } @@ -178,8 +171,7 @@ public class ReportPathAwareVisitorTest { newCallRecord("visitAny", 12, 1, of(12, 1)), newCallRecord("visitModule", 12, 1, of(12, 1)), newCallRecord("visitAny", 1, null, of(1)), - newCallRecord("visitProject", 1, null, of(1)) - ).iterator(); + newCallRecord("visitProject", 1, null, of(1))).iterator(); verifyCallRecords(expected, underTest.callsRecords.iterator()); } @@ -202,8 +194,7 @@ public class ReportPathAwareVisitorTest { newCallRecord("visitAny", 12, 1, of(12, 1)), newCallRecord("visitModule", 12, 1, of(12, 1)), newCallRecord("visitAny", 1, null, of(1)), - newCallRecord("visitProject", 1, null, of(1)) - ).iterator(); + newCallRecord("visitProject", 1, null, of(1))).iterator(); verifyCallRecords(expected, underTest.callsRecords.iterator()); } @@ -220,8 +211,7 @@ public class ReportPathAwareVisitorTest { newCallRecord("visitAny", 12, 1, of(12, 1)), newCallRecord("visitModule", 12, 1, of(12, 1)), newCallRecord("visitAny", 1, null, of(1)), - newCallRecord("visitProject", 1, null, of(1)) - ).iterator(); + newCallRecord("visitProject", 1, null, of(1))).iterator(); verifyCallRecords(expected, underTest.callsRecords.iterator()); } @@ -232,8 +222,7 @@ public class ReportPathAwareVisitorTest { Iterator expected = of( newCallRecord("visitAny", 1, null, of(1)), - newCallRecord("visitProject", 1, null, of(1)) - ).iterator(); + newCallRecord("visitProject", 1, null, of(1))).iterator(); verifyCallRecords(expected, underTest.callsRecords.iterator()); } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java similarity index 71% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java index d8f2bdb1ccb..8c0f64e6530 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPostOrderDepthTraversalTypeAwareCrawlerTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import org.junit.Test; import static org.assertj.core.api.Assertions.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.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; public class ReportPostOrderDepthTraversalTypeAwareCrawlerTest { @@ -57,8 +57,8 @@ public class ReportPostOrderDepthTraversalTypeAwareCrawlerTest { fileCrawler.visit(component); assertThat(fileVisitor.callsRecords).containsExactly( - reportCallRecord("visitAny", component), - reportCallRecord("visitFile", component)); + reportCallRecord("visitAny", component), + reportCallRecord("visitFile", component)); } @Test @@ -67,8 +67,8 @@ public class ReportPostOrderDepthTraversalTypeAwareCrawlerTest { fileCrawler.visit(component); assertThat(fileVisitor.callsRecords).containsExactly( - reportCallRecord("visitAny", component), - reportCallRecord("visitModule", component)); + reportCallRecord("visitAny", component), + reportCallRecord("visitModule", component)); } @Test @@ -77,8 +77,8 @@ public class ReportPostOrderDepthTraversalTypeAwareCrawlerTest { fileCrawler.visit(component); assertThat(fileVisitor.callsRecords).containsExactly( - reportCallRecord("visitAny", component), - reportCallRecord("visitDirectory", component)); + reportCallRecord("visitAny", component), + reportCallRecord("visitDirectory", component)); } @Test @@ -87,8 +87,8 @@ public class ReportPostOrderDepthTraversalTypeAwareCrawlerTest { fileCrawler.visit(component); assertThat(fileVisitor.callsRecords).containsExactly( - reportCallRecord("visitAny", component), - reportCallRecord("visitProject", component)); + reportCallRecord("visitAny", component), + reportCallRecord("visitProject", component)); } @Test @@ -105,8 +105,8 @@ public class ReportPostOrderDepthTraversalTypeAwareCrawlerTest { directoryCrawler.visit(component); assertThat(directoryVisitor.callsRecords).containsExactly( - reportCallRecord("visitAny", component), - reportCallRecord("visitDirectory", component)); + reportCallRecord("visitAny", component), + reportCallRecord("visitDirectory", component)); } @Test @@ -115,8 +115,8 @@ public class ReportPostOrderDepthTraversalTypeAwareCrawlerTest { directoryCrawler.visit(component); assertThat(directoryVisitor.callsRecords).containsExactly( - reportCallRecord("visitAny", component), - reportCallRecord("visitModule", component)); + reportCallRecord("visitAny", component), + reportCallRecord("visitModule", component)); } @Test @@ -125,8 +125,8 @@ public class ReportPostOrderDepthTraversalTypeAwareCrawlerTest { directoryCrawler.visit(component); assertThat(directoryVisitor.callsRecords).containsExactly( - reportCallRecord("visitAny", component), - reportCallRecord("visitProject", component)); + reportCallRecord("visitAny", component), + reportCallRecord("visitProject", component)); } @Test @@ -151,8 +151,8 @@ public class ReportPostOrderDepthTraversalTypeAwareCrawlerTest { moduleCrawler.visit(component); assertThat(moduleVisitor.callsRecords).containsExactly( - reportCallRecord("visitAny", component), - reportCallRecord("visitModule", component)); + reportCallRecord("visitAny", component), + reportCallRecord("visitModule", component)); } @Test @@ -161,8 +161,8 @@ public class ReportPostOrderDepthTraversalTypeAwareCrawlerTest { moduleCrawler.visit(component); assertThat(moduleVisitor.callsRecords).containsExactly( - reportCallRecord("visitAny", component), - reportCallRecord("visitModule", component)); + reportCallRecord("visitAny", component), + reportCallRecord("visitModule", component)); } @Test @@ -195,8 +195,8 @@ public class ReportPostOrderDepthTraversalTypeAwareCrawlerTest { projectCrawler.visit(component); assertThat(projectVisitor.callsRecords).containsExactly( - reportCallRecord("visitAny", component), - reportCallRecord("visitProject", component)); + reportCallRecord("visitAny", component), + reportCallRecord("visitProject", component)); } @Test @@ -204,18 +204,18 @@ public class ReportPostOrderDepthTraversalTypeAwareCrawlerTest { fileCrawler.visit(COMPONENT_TREE); assertThat(fileVisitor.callsRecords).containsExactly( - reportCallRecord("visitAny", FILE_5), - reportCallRecord("visitFile", FILE_5), - reportCallRecord("visitAny", FILE_6), - reportCallRecord("visitFile", FILE_6), - reportCallRecord("visitAny", DIRECTORY_4), - reportCallRecord("visitDirectory", DIRECTORY_4), - reportCallRecord("visitAny", MODULE_3), - reportCallRecord("visitModule", MODULE_3), - reportCallRecord("visitAny", MODULE_2), - reportCallRecord("visitModule", MODULE_2), - reportCallRecord("visitAny", COMPONENT_TREE), - reportCallRecord("visitProject", COMPONENT_TREE)); + reportCallRecord("visitAny", FILE_5), + reportCallRecord("visitFile", FILE_5), + reportCallRecord("visitAny", FILE_6), + reportCallRecord("visitFile", FILE_6), + reportCallRecord("visitAny", DIRECTORY_4), + reportCallRecord("visitDirectory", DIRECTORY_4), + reportCallRecord("visitAny", MODULE_3), + reportCallRecord("visitModule", MODULE_3), + reportCallRecord("visitAny", MODULE_2), + reportCallRecord("visitModule", MODULE_2), + reportCallRecord("visitAny", COMPONENT_TREE), + reportCallRecord("visitProject", COMPONENT_TREE)); } @Test @@ -223,14 +223,14 @@ public class ReportPostOrderDepthTraversalTypeAwareCrawlerTest { directoryCrawler.visit(COMPONENT_TREE); assertThat(directoryVisitor.callsRecords).containsExactly( - reportCallRecord("visitAny", DIRECTORY_4), - reportCallRecord("visitDirectory", DIRECTORY_4), - reportCallRecord("visitAny", MODULE_3), - reportCallRecord("visitModule", MODULE_3), - reportCallRecord("visitAny", MODULE_2), - reportCallRecord("visitModule", MODULE_2), - reportCallRecord("visitAny", COMPONENT_TREE), - reportCallRecord("visitProject", COMPONENT_TREE)); + reportCallRecord("visitAny", DIRECTORY_4), + reportCallRecord("visitDirectory", DIRECTORY_4), + reportCallRecord("visitAny", MODULE_3), + reportCallRecord("visitModule", MODULE_3), + reportCallRecord("visitAny", MODULE_2), + reportCallRecord("visitModule", MODULE_2), + reportCallRecord("visitAny", COMPONENT_TREE), + reportCallRecord("visitProject", COMPONENT_TREE)); } @Test @@ -238,12 +238,12 @@ public class ReportPostOrderDepthTraversalTypeAwareCrawlerTest { moduleCrawler.visit(COMPONENT_TREE); assertThat(moduleVisitor.callsRecords).containsExactly( - reportCallRecord("visitAny", MODULE_3), - reportCallRecord("visitModule", MODULE_3), - reportCallRecord("visitAny", MODULE_2), - reportCallRecord("visitModule", MODULE_2), - reportCallRecord("visitAny", COMPONENT_TREE), - reportCallRecord("visitProject", COMPONENT_TREE)); + reportCallRecord("visitAny", MODULE_3), + reportCallRecord("visitModule", MODULE_3), + reportCallRecord("visitAny", MODULE_2), + reportCallRecord("visitModule", MODULE_2), + reportCallRecord("visitAny", COMPONENT_TREE), + reportCallRecord("visitProject", COMPONENT_TREE)); } @Test @@ -251,8 +251,8 @@ public class ReportPostOrderDepthTraversalTypeAwareCrawlerTest { projectCrawler.visit(COMPONENT_TREE); assertThat(projectVisitor.callsRecords).containsExactly( - reportCallRecord("visitAny", COMPONENT_TREE), - reportCallRecord("visitProject", COMPONENT_TREE)); + reportCallRecord("visitAny", COMPONENT_TREE), + reportCallRecord("visitProject", COMPONENT_TREE)); } private static Component component(final Component.Type type, final int ref, final Component... children) { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java index f4de442f1ac..75aa1f82ef0 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportPreOrderDepthTraversalTypeAwareCrawlerTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import org.junit.Test; import static org.assertj.core.api.Assertions.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.component.ComponentVisitor.Order.PRE_ORDER; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ReportPreOrderDepthTraversalTypeAwareCrawlerTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ReportVisitorsCrawlerTest.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ReportVisitorsCrawlerTest.java index d4eb6443a0c..e463a905d5a 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.Arrays; import org.junit.Rule; @@ -30,12 +30,12 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.spy; -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; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ReportVisitorsCrawlerTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPathAwareVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ReportVisitorsCrawlerWithPathAwareVisitorTest.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPathAwareVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ReportVisitorsCrawlerWithPathAwareVisitorTest.java index 34e5772b845..829ac3eb3d7 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPathAwareVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.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.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; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ReportVisitorsCrawlerWithPathAwareVisitorTest { @@ -44,13 +44,11 @@ public class ReportVisitorsCrawlerWithPathAwareVisitorTest { ReportComponent.builder(DIRECTORY, 111) .addChildren( ReportComponent.builder(FILE, 1111).build(), - ReportComponent.builder(FILE, 1112).build() - ) + ReportComponent.builder(FILE, 1112).build()) .build(), ReportComponent.builder(DIRECTORY, 112) .addChildren( - ReportComponent.builder(FILE, 1121).build() - ) + ReportComponent.builder(FILE, 1121).build()) .build()) .build(), ReportComponent.builder(MODULE, 12) @@ -59,12 +57,11 @@ public class ReportVisitorsCrawlerWithPathAwareVisitorTest { .addChildren( ReportComponent.builder(DIRECTORY, 1211) .addChildren( - ReportComponent.builder(FILE, 12111).build() - ) - .build() - ).build() - ).build() - ).build(); + ReportComponent.builder(FILE, 12111).build()) + .build()) + .build()) + .build()) + .build(); @Test public void verify_preOrder_visit_call_when_visit_tree_with_depth_FILE() { @@ -94,8 +91,7 @@ public class ReportVisitorsCrawlerWithPathAwareVisitorTest { reportCallRecord("visitAny", 1211, 121, of(1211, 121, 12, 1)), reportCallRecord("visitDirectory", 1211, 121, of(1211, 121, 12, 1)), reportCallRecord("visitAny", 12111, 1211, of(12111, 1211, 121, 12, 1)), - reportCallRecord("visitFile", 12111, 1211, of(12111, 1211, 121, 12, 1)) - ).iterator(); + reportCallRecord("visitFile", 12111, 1211, of(12111, 1211, 121, 12, 1))).iterator(); verifyCallRecords(expected, visitor.callsRecords.iterator()); } @@ -119,8 +115,7 @@ public class ReportVisitorsCrawlerWithPathAwareVisitorTest { reportCallRecord("visitAny", 121, 12, of(121, 12, 1)), reportCallRecord("visitModule", 121, 12, of(121, 12, 1)), reportCallRecord("visitAny", 1211, 121, of(1211, 121, 12, 1)), - reportCallRecord("visitDirectory", 1211, 121, of(1211, 121, 12, 1)) - ).iterator(); + reportCallRecord("visitDirectory", 1211, 121, of(1211, 121, 12, 1))).iterator(); verifyCallRecords(expected, visitor.callsRecords.iterator()); } @@ -138,8 +133,7 @@ public class ReportVisitorsCrawlerWithPathAwareVisitorTest { reportCallRecord("visitAny", 12, 1, of(12, 1)), reportCallRecord("visitModule", 12, 1, of(12, 1)), reportCallRecord("visitAny", 121, 12, of(121, 12, 1)), - reportCallRecord("visitModule", 121, 12, of(121, 12, 1)) - ).iterator(); + reportCallRecord("visitModule", 121, 12, of(121, 12, 1))).iterator(); verifyCallRecords(expected, visitor.callsRecords.iterator()); } @@ -151,8 +145,7 @@ public class ReportVisitorsCrawlerWithPathAwareVisitorTest { Iterator expected = of( reportCallRecord("visitAny", 1, null, of(1)), - reportCallRecord("visitProject", 1, null, of(1)) - ).iterator(); + reportCallRecord("visitProject", 1, null, of(1))).iterator(); verifyCallRecords(expected, visitor.callsRecords.iterator()); } @@ -184,8 +177,7 @@ public class ReportVisitorsCrawlerWithPathAwareVisitorTest { reportCallRecord("visitAny", 12, 1, of(12, 1)), reportCallRecord("visitModule", 12, 1, of(12, 1)), reportCallRecord("visitAny", 1, null, of(1)), - reportCallRecord("visitProject", 1, null, of(1)) - ).iterator(); + reportCallRecord("visitProject", 1, null, of(1))).iterator(); verifyCallRecords(expected, visitor.callsRecords.iterator()); } @@ -209,8 +201,7 @@ public class ReportVisitorsCrawlerWithPathAwareVisitorTest { reportCallRecord("visitAny", 12, 1, of(12, 1)), reportCallRecord("visitModule", 12, 1, of(12, 1)), reportCallRecord("visitAny", 1, null, of(1)), - reportCallRecord("visitProject", 1, null, of(1)) - ).iterator(); + reportCallRecord("visitProject", 1, null, of(1))).iterator(); verifyCallRecords(expected, visitor.callsRecords.iterator()); } @@ -228,8 +219,7 @@ public class ReportVisitorsCrawlerWithPathAwareVisitorTest { reportCallRecord("visitAny", 12, 1, of(12, 1)), reportCallRecord("visitModule", 12, 1, of(12, 1)), reportCallRecord("visitAny", 1, null, of(1)), - reportCallRecord("visitProject", 1, null, of(1)) - ).iterator(); + reportCallRecord("visitProject", 1, null, of(1))).iterator(); verifyCallRecords(expected, visitor.callsRecords.iterator()); } @@ -241,8 +231,7 @@ public class ReportVisitorsCrawlerWithPathAwareVisitorTest { Iterator expected = of( reportCallRecord("visitAny", 1, null, of(1)), - reportCallRecord("visitProject", 1, null, of(1)) - ).iterator(); + reportCallRecord("visitProject", 1, null, of(1))).iterator(); verifyCallRecords(expected, visitor.callsRecords.iterator()); } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java index 6e29b65be5e..08117558d9c 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.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.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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; public class ReportVisitorsCrawlerWithPostOrderTypeAwareVisitorTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java index 0d35f3bad50..64beb48bc91 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.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.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; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ReportVisitorsCrawlerWithPreOrderTypeAwareVisitorTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ShortBranchComponentsWithIssuesTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ShortBranchComponentsWithIssuesTest.java similarity index 99% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ShortBranchComponentsWithIssuesTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ShortBranchComponentsWithIssuesTest.java index f0fca60160f..ce880fe0188 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ShortBranchComponentsWithIssuesTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ShortBranchComponentsWithIssuesTest.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import org.junit.Before; import org.junit.Rule; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TestSettingsRepository.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/TestSettingsRepository.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TestSettingsRepository.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/TestSettingsRepository.java index f68e6a276b8..2d8d71063d7 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TestSettingsRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/TestSettingsRepository.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import org.sonar.api.config.Configuration; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeComponentProvider.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/TreeComponentProvider.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeComponentProvider.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/TreeComponentProvider.java index 71998e4a4e2..10e49e301ea 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeComponentProvider.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.HashMap; import java.util.Map; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderComponentProvider.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/TreeRootHolderComponentProvider.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderComponentProvider.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/TreeRootHolderComponentProvider.java index 8f4d605d6ca..29dae063e38 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderComponentProvider.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; public final class TreeRootHolderComponentProvider extends AbstractComponentProvider { private final TreeRootHolder treeRootHolder; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/TreeRootHolderImplTest.java similarity index 83% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/TreeRootHolderImplTest.java index 2edd2ec1ebb..ca8f50854f1 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.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.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; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; public class TreeRootHolderImplTest { @@ -39,18 +39,15 @@ public class TreeRootHolderImplTest { ReportComponent.builder(MODULE, 2) .addChildren(ReportComponent.builder(DIRECTORY, 3) .addChildren( - ReportComponent.builder(FILE, 4).build() - ) + ReportComponent.builder(FILE, 4).build()) .build()) - .build() - ) + .build()) .build(); private static final ViewsComponent SOME_VIEWS_COMPONENT_TREE = ViewsComponent.builder(VIEW, 1) .addChildren( ViewsComponent.builder(VIEW, 2) .addChildren(ViewsComponent.builder(PROJECT_VIEW, 3).build()) - .build() - ) + .build()) .build(); @Rule diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/TreeRootHolderRule.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/TreeRootHolderRule.java index edcf51342ec..2bec414a8b3 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TreeRootHolderRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/TreeRootHolderRule.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.Optional; import org.junit.rules.ExternalResource; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapterTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/TypeAwareVisitorAdapterTest.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapterTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/TypeAwareVisitorAdapterTest.java index dd2ce57d096..b2d9fd090f6 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/TypeAwareVisitorAdapterTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import org.junit.Test; -import static org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; public class TypeAwareVisitorAdapterTest { @Test(expected = NullPointerException.class) diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewAttributesTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ViewAttributesTest.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewAttributesTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ViewAttributesTest.java index 6783441f1c4..cc61a5dbfc7 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewAttributesTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ViewAttributesTest.java @@ -17,7 +17,7 @@ * along with this program; 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.component; +package org.sonar.ce.task.projectanalysis.component; import org.junit.Rule; import org.junit.Test; @@ -25,8 +25,8 @@ import org.junit.rules.ExpectedException; import org.sonar.api.resources.Qualifiers; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.task.projectanalysis.component.ViewAttributes.Type.APPLICATION; -import static org.sonar.server.computation.task.projectanalysis.component.ViewAttributes.Type.PORTFOLIO; +import static org.sonar.ce.task.projectanalysis.component.ViewAttributes.Type.APPLICATION; +import static org.sonar.ce.task.projectanalysis.component.ViewAttributes.Type.PORTFOLIO; public class ViewAttributesTest { @Rule diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsComponent.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ViewsComponent.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsComponent.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ViewsComponent.java index a9a6c204b3d..e75b2500d89 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsComponent.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import com.google.common.collect.ImmutableList; import java.util.ArrayList; @@ -136,7 +136,7 @@ public class ViewsComponent implements Component { public Type getType() { return type; } - + @Override public Status getStatus() { return Status.UNAVAILABLE; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPathAwareVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ViewsPathAwareVisitorTest.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPathAwareVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ViewsPathAwareVisitorTest.java index 9665c234ebd..d54ba3aca28 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPathAwareVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.Iterator; import java.util.List; @@ -26,38 +26,38 @@ 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.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; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ViewsPathAwareVisitorTest { private static final int ROOT_KEY = 1; private static final Component SOME_TREE_ROOT = ViewsComponent.builder(VIEW, ROOT_KEY) .addChildren( - ViewsComponent.builder(SUBVIEW, 11) + ViewsComponent.builder(SUBVIEW, 11) .addChildren( - ViewsComponent.builder(SUBVIEW, 111) + ViewsComponent.builder(SUBVIEW, 111) .addChildren( - ViewsComponent.builder(PROJECT_VIEW, 1111).build(), - ViewsComponent.builder(PROJECT_VIEW, 1112).build() + ViewsComponent.builder(PROJECT_VIEW, 1111).build(), + ViewsComponent.builder(PROJECT_VIEW, 1112).build() ) .build(), - ViewsComponent.builder(SUBVIEW, 112) + ViewsComponent.builder(SUBVIEW, 112) .addChildren( ViewsComponent.builder(PROJECT_VIEW, 1121).build() ) .build()) .build(), - ViewsComponent.builder(SUBVIEW, 12) + ViewsComponent.builder(SUBVIEW, 12) .addChildren( - ViewsComponent.builder(SUBVIEW, 121) + ViewsComponent.builder(SUBVIEW, 121) .addChildren( - ViewsComponent.builder(SUBVIEW, 1211) + ViewsComponent.builder(SUBVIEW, 1211) .addChildren( - ViewsComponent.builder(PROJECT_VIEW, 12111).build() + ViewsComponent.builder(PROJECT_VIEW, 12111).build() ) .build() ).build() @@ -92,7 +92,7 @@ public class ViewsPathAwareVisitorTest { viewsCallRecord("visitSubView", 1211, 121, of(1211, 121, 12, 1)), viewsCallRecord("visitAny", 12111, 1211, of(12111, 1211, 121, 12, 1)), viewsCallRecord("visitProjectView", 12111, 1211, of(12111, 1211, 121, 12, 1)) - ).iterator(); + ).iterator(); verifyCallRecords(expected, underTest.callsRecords.iterator()); } @@ -116,7 +116,7 @@ public class ViewsPathAwareVisitorTest { viewsCallRecord("visitSubView", 121, 12, of(121, 12, 1)), viewsCallRecord("visitAny", 1211, 121, of(1211, 121, 12, 1)), viewsCallRecord("visitSubView", 1211, 121, of(1211, 121, 12, 1)) - ).iterator(); + ).iterator(); verifyCallRecords(expected, underTest.callsRecords.iterator()); } @@ -128,7 +128,7 @@ public class ViewsPathAwareVisitorTest { Iterator expected = of( viewsCallRecord("visitAny", 1, null, of(1)), viewsCallRecord("visitView", 1, null, of(1)) - ).iterator(); + ).iterator(); verifyCallRecords(expected, underTest.callsRecords.iterator()); } @@ -160,7 +160,7 @@ public class ViewsPathAwareVisitorTest { viewsCallRecord("visitSubView", 12, 1, of(12, 1)), viewsCallRecord("visitAny", 1, null, of(1)), viewsCallRecord("visitView", 1, null, of(1)) - ).iterator(); + ).iterator(); verifyCallRecords(expected, underTest.callsRecords.iterator()); } @@ -184,7 +184,7 @@ public class ViewsPathAwareVisitorTest { viewsCallRecord("visitSubView", 12, 1, of(12, 1)), viewsCallRecord("visitAny", 1, null, of(1)), viewsCallRecord("visitView", 1, null, of(1)) - ).iterator(); + ).iterator(); verifyCallRecords(expected, underTest.callsRecords.iterator()); } @@ -196,7 +196,7 @@ public class ViewsPathAwareVisitorTest { Iterator expected = of( viewsCallRecord("visitAny", 1, null, of(1)), viewsCallRecord("visitView", 1, null, of(1)) - ).iterator(); + ).iterator(); verifyCallRecords(expected, underTest.callsRecords.iterator()); } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPostOrderDepthTraversalTypeAwareCrawlerTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ViewsPostOrderDepthTraversalTypeAwareCrawlerTest.java similarity index 70% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPostOrderDepthTraversalTypeAwareCrawlerTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ViewsPostOrderDepthTraversalTypeAwareCrawlerTest.java index 9c62726eb02..4a5eb544c26 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPostOrderDepthTraversalTypeAwareCrawlerTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -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.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; public class ViewsPostOrderDepthTraversalTypeAwareCrawlerTest { @@ -55,8 +55,8 @@ public class ViewsPostOrderDepthTraversalTypeAwareCrawlerTest { projectViewCrawler.visit(component); assertThat(projectViewVisitor.callsRecords).containsExactly( - viewsCallRecord("visitAny", component), - viewsCallRecord("visitProjectView", component)); + viewsCallRecord("visitAny", component), + viewsCallRecord("visitProjectView", component)); } @Test @@ -65,8 +65,8 @@ public class ViewsPostOrderDepthTraversalTypeAwareCrawlerTest { projectViewCrawler.visit(component); assertThat(projectViewVisitor.callsRecords).containsExactly( - viewsCallRecord("visitAny", component), - viewsCallRecord("visitSubView", component)); + viewsCallRecord("visitAny", component), + viewsCallRecord("visitSubView", component)); } @Test @@ -75,8 +75,8 @@ public class ViewsPostOrderDepthTraversalTypeAwareCrawlerTest { projectViewCrawler.visit(component); assertThat(projectViewVisitor.callsRecords).containsExactly( - viewsCallRecord("visitAny", component), - viewsCallRecord("visitView", component)); + viewsCallRecord("visitAny", component), + viewsCallRecord("visitView", component)); } @Test @@ -93,8 +93,8 @@ public class ViewsPostOrderDepthTraversalTypeAwareCrawlerTest { subViewCrawler.visit(component); assertThat(subViewVisitor.callsRecords).containsExactly( - viewsCallRecord("visitAny", component), - viewsCallRecord("visitSubView", component)); + viewsCallRecord("visitAny", component), + viewsCallRecord("visitSubView", component)); } @Test @@ -103,8 +103,8 @@ public class ViewsPostOrderDepthTraversalTypeAwareCrawlerTest { subViewCrawler.visit(component); assertThat(subViewVisitor.callsRecords).containsExactly( - viewsCallRecord("visitAny", component), - viewsCallRecord("visitView", component)); + viewsCallRecord("visitAny", component), + viewsCallRecord("visitView", component)); } @Test @@ -129,8 +129,8 @@ public class ViewsPostOrderDepthTraversalTypeAwareCrawlerTest { viewCrawler.visit(component); assertThat(viewVisitor.callsRecords).containsExactly( - viewsCallRecord("visitAny", component), - viewsCallRecord("visitView", component)); + viewsCallRecord("visitAny", component), + viewsCallRecord("visitView", component)); } @Test @@ -138,18 +138,18 @@ public class ViewsPostOrderDepthTraversalTypeAwareCrawlerTest { projectViewCrawler.visit(COMPONENT_TREE); assertThat(projectViewVisitor.callsRecords).containsExactly( - viewsCallRecord("visitAny", PROJECT_VIEW_5), - viewsCallRecord("visitProjectView", PROJECT_VIEW_5), - viewsCallRecord("visitAny", PROJECT_VIEW_6), - viewsCallRecord("visitProjectView", PROJECT_VIEW_6), - viewsCallRecord("visitAny", SUBVIEW_4), - viewsCallRecord("visitSubView", SUBVIEW_4), - viewsCallRecord("visitAny", SUBVIEW_3), - viewsCallRecord("visitSubView", SUBVIEW_3), - viewsCallRecord("visitAny", SUBVIEW_2), - viewsCallRecord("visitSubView", SUBVIEW_2), - viewsCallRecord("visitAny", COMPONENT_TREE), - viewsCallRecord("visitView", COMPONENT_TREE)); + viewsCallRecord("visitAny", PROJECT_VIEW_5), + viewsCallRecord("visitProjectView", PROJECT_VIEW_5), + viewsCallRecord("visitAny", PROJECT_VIEW_6), + viewsCallRecord("visitProjectView", PROJECT_VIEW_6), + viewsCallRecord("visitAny", SUBVIEW_4), + viewsCallRecord("visitSubView", SUBVIEW_4), + viewsCallRecord("visitAny", SUBVIEW_3), + viewsCallRecord("visitSubView", SUBVIEW_3), + viewsCallRecord("visitAny", SUBVIEW_2), + viewsCallRecord("visitSubView", SUBVIEW_2), + viewsCallRecord("visitAny", COMPONENT_TREE), + viewsCallRecord("visitView", COMPONENT_TREE)); } @Test @@ -157,14 +157,14 @@ public class ViewsPostOrderDepthTraversalTypeAwareCrawlerTest { subViewCrawler.visit(COMPONENT_TREE); assertThat(subViewVisitor.callsRecords).containsExactly( - viewsCallRecord("visitAny", SUBVIEW_4), - viewsCallRecord("visitSubView", SUBVIEW_4), - viewsCallRecord("visitAny", SUBVIEW_3), - viewsCallRecord("visitSubView", SUBVIEW_3), - viewsCallRecord("visitAny", SUBVIEW_2), - viewsCallRecord("visitSubView", SUBVIEW_2), - viewsCallRecord("visitAny", COMPONENT_TREE), - viewsCallRecord("visitView", COMPONENT_TREE)); + viewsCallRecord("visitAny", SUBVIEW_4), + viewsCallRecord("visitSubView", SUBVIEW_4), + viewsCallRecord("visitAny", SUBVIEW_3), + viewsCallRecord("visitSubView", SUBVIEW_3), + viewsCallRecord("visitAny", SUBVIEW_2), + viewsCallRecord("visitSubView", SUBVIEW_2), + viewsCallRecord("visitAny", COMPONENT_TREE), + viewsCallRecord("visitView", COMPONENT_TREE)); } @Test @@ -172,8 +172,8 @@ public class ViewsPostOrderDepthTraversalTypeAwareCrawlerTest { viewCrawler.visit(COMPONENT_TREE); assertThat(viewVisitor.callsRecords).containsExactly( - viewsCallRecord("visitAny", COMPONENT_TREE), - viewsCallRecord("visitView", COMPONENT_TREE)); + viewsCallRecord("visitAny", COMPONENT_TREE), + viewsCallRecord("visitView", COMPONENT_TREE)); } private static Component component(Component.Type type, int ref, Component... children) { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPreOrderDepthTraversalTypeAwareCrawlerTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ViewsPreOrderDepthTraversalTypeAwareCrawlerTest.java similarity index 71% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPreOrderDepthTraversalTypeAwareCrawlerTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ViewsPreOrderDepthTraversalTypeAwareCrawlerTest.java index ecf5bbb79fa..1dc433925e3 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsPreOrderDepthTraversalTypeAwareCrawlerTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -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; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ViewsPreOrderDepthTraversalTypeAwareCrawlerTest { @@ -55,8 +55,8 @@ public class ViewsPreOrderDepthTraversalTypeAwareCrawlerTest { projectViewCrawler.visit(component); assertThat(projectViewVisitor.callsRecords).containsExactly( - viewsCallRecord("visitAny", component), - viewsCallRecord("visitProjectView", component)); + viewsCallRecord("visitAny", component), + viewsCallRecord("visitProjectView", component)); } @Test @@ -65,8 +65,8 @@ public class ViewsPreOrderDepthTraversalTypeAwareCrawlerTest { projectViewCrawler.visit(component); assertThat(projectViewVisitor.callsRecords).containsExactly( - viewsCallRecord("visitAny", component), - viewsCallRecord("visitSubView", component)); + viewsCallRecord("visitAny", component), + viewsCallRecord("visitSubView", component)); } @Test @@ -75,8 +75,8 @@ public class ViewsPreOrderDepthTraversalTypeAwareCrawlerTest { projectViewCrawler.visit(component); assertThat(projectViewVisitor.callsRecords).containsExactly( - viewsCallRecord("visitAny", component), - viewsCallRecord("visitView", component)); + viewsCallRecord("visitAny", component), + viewsCallRecord("visitView", component)); } @Test @@ -93,8 +93,8 @@ public class ViewsPreOrderDepthTraversalTypeAwareCrawlerTest { subViewCrawler.visit(component); assertThat(subViewVisitor.callsRecords).containsExactly( - viewsCallRecord("visitAny", component), - viewsCallRecord("visitSubView", component)); + viewsCallRecord("visitAny", component), + viewsCallRecord("visitSubView", component)); } @Test @@ -103,8 +103,8 @@ public class ViewsPreOrderDepthTraversalTypeAwareCrawlerTest { subViewCrawler.visit(component); assertThat(subViewVisitor.callsRecords).containsExactly( - viewsCallRecord("visitAny", component), - viewsCallRecord("visitView", component)); + viewsCallRecord("visitAny", component), + viewsCallRecord("visitView", component)); } @Test @@ -129,8 +129,8 @@ public class ViewsPreOrderDepthTraversalTypeAwareCrawlerTest { viewCrawler.visit(component); assertThat(viewVisitor.callsRecords).containsExactly( - viewsCallRecord("visitAny", component), - viewsCallRecord("visitView", component)); + viewsCallRecord("visitAny", component), + viewsCallRecord("visitView", component)); } @Test @@ -138,18 +138,18 @@ public class ViewsPreOrderDepthTraversalTypeAwareCrawlerTest { projectViewCrawler.visit(COMPONENT_TREE); assertThat(projectViewVisitor.callsRecords).containsExactly( - viewsCallRecord("visitAny", COMPONENT_TREE), - viewsCallRecord("visitView", COMPONENT_TREE), - viewsCallRecord("visitAny", SUBVIEW_2), - viewsCallRecord("visitSubView", SUBVIEW_2), - viewsCallRecord("visitAny", SUBVIEW_3), - viewsCallRecord("visitSubView", SUBVIEW_3), - viewsCallRecord("visitAny", SUBVIEW_4), - viewsCallRecord("visitSubView", SUBVIEW_4), - viewsCallRecord("visitAny", PROJECT_VIEW_5), - viewsCallRecord("visitProjectView", PROJECT_VIEW_5), - viewsCallRecord("visitAny", PROJECT_VIEW_6), - viewsCallRecord("visitProjectView", PROJECT_VIEW_6)); + viewsCallRecord("visitAny", COMPONENT_TREE), + viewsCallRecord("visitView", COMPONENT_TREE), + viewsCallRecord("visitAny", SUBVIEW_2), + viewsCallRecord("visitSubView", SUBVIEW_2), + viewsCallRecord("visitAny", SUBVIEW_3), + viewsCallRecord("visitSubView", SUBVIEW_3), + viewsCallRecord("visitAny", SUBVIEW_4), + viewsCallRecord("visitSubView", SUBVIEW_4), + viewsCallRecord("visitAny", PROJECT_VIEW_5), + viewsCallRecord("visitProjectView", PROJECT_VIEW_5), + viewsCallRecord("visitAny", PROJECT_VIEW_6), + viewsCallRecord("visitProjectView", PROJECT_VIEW_6)); } @Test @@ -157,14 +157,14 @@ public class ViewsPreOrderDepthTraversalTypeAwareCrawlerTest { subViewCrawler.visit(COMPONENT_TREE); assertThat(subViewVisitor.callsRecords).containsExactly( - viewsCallRecord("visitAny", COMPONENT_TREE), - viewsCallRecord("visitView", COMPONENT_TREE), - viewsCallRecord("visitAny", SUBVIEW_2), - viewsCallRecord("visitSubView", SUBVIEW_2), - viewsCallRecord("visitAny", SUBVIEW_3), - viewsCallRecord("visitSubView", SUBVIEW_3), - viewsCallRecord("visitAny", SUBVIEW_4), - viewsCallRecord("visitSubView", SUBVIEW_4)); + viewsCallRecord("visitAny", COMPONENT_TREE), + viewsCallRecord("visitView", COMPONENT_TREE), + viewsCallRecord("visitAny", SUBVIEW_2), + viewsCallRecord("visitSubView", SUBVIEW_2), + viewsCallRecord("visitAny", SUBVIEW_3), + viewsCallRecord("visitSubView", SUBVIEW_3), + viewsCallRecord("visitAny", SUBVIEW_4), + viewsCallRecord("visitSubView", SUBVIEW_4)); } @Test @@ -172,8 +172,8 @@ public class ViewsPreOrderDepthTraversalTypeAwareCrawlerTest { viewCrawler.visit(COMPONENT_TREE); assertThat(viewVisitor.callsRecords).containsExactly( - viewsCallRecord("visitAny", COMPONENT_TREE), - viewsCallRecord("visitView", COMPONENT_TREE)); + viewsCallRecord("visitAny", COMPONENT_TREE), + viewsCallRecord("visitView", COMPONENT_TREE)); } private static Component component(final Component.Type type, final int ref, final Component... children) { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java index f0467ce5514..cf21f803887 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.task.projectanalysis.component; import java.util.Arrays; import org.junit.Rule; @@ -30,11 +30,11 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.spy; -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; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ViewsVisitorsCrawlerTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPathAwareVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ViewsVisitorsCrawlerWithPathAwareVisitorTest.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPathAwareVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ViewsVisitorsCrawlerWithPathAwareVisitorTest.java index 7efccb6a693..3abd9fbca88 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPathAwareVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.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.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; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ViewsVisitorsCrawlerWithPathAwareVisitorTest { @@ -43,13 +43,11 @@ public class ViewsVisitorsCrawlerWithPathAwareVisitorTest { ViewsComponent.builder(SUBVIEW, 111) .addChildren( ViewsComponent.builder(PROJECT_VIEW, 1111).build(), - ViewsComponent.builder(PROJECT_VIEW, 1112).build() - ) + ViewsComponent.builder(PROJECT_VIEW, 1112).build()) .build(), ViewsComponent.builder(SUBVIEW, 112) .addChildren( - ViewsComponent.builder(PROJECT_VIEW, 1121).build() - ) + ViewsComponent.builder(PROJECT_VIEW, 1121).build()) .build()) .build(), ViewsComponent.builder(SUBVIEW, 12) @@ -58,12 +56,11 @@ public class ViewsVisitorsCrawlerWithPathAwareVisitorTest { .addChildren( ViewsComponent.builder(SUBVIEW, 1211) .addChildren( - ViewsComponent.builder(PROJECT_VIEW, 12111).build() - ) - .build() - ).build() - ).build() - ).build(); + ViewsComponent.builder(PROJECT_VIEW, 12111).build()) + .build()) + .build()) + .build()) + .build(); @Test public void verify_preOrder_visit_call_when_visit_tree_with_depth_PROJECT_VIEW() { @@ -93,8 +90,7 @@ public class ViewsVisitorsCrawlerWithPathAwareVisitorTest { viewsCallRecord("visitAny", 1211, 121, of(1211, 121, 12, 1)), viewsCallRecord("visitSubView", 1211, 121, of(1211, 121, 12, 1)), viewsCallRecord("visitAny", 12111, 1211, of(12111, 1211, 121, 12, 1)), - viewsCallRecord("visitProjectView", 12111, 1211, of(12111, 1211, 121, 12, 1)) - ).iterator(); + viewsCallRecord("visitProjectView", 12111, 1211, of(12111, 1211, 121, 12, 1))).iterator(); verifyCallRecords(expected, visitor.callsRecords.iterator()); } @@ -118,8 +114,7 @@ public class ViewsVisitorsCrawlerWithPathAwareVisitorTest { viewsCallRecord("visitAny", 121, 12, of(121, 12, 1)), viewsCallRecord("visitSubView", 121, 12, of(121, 12, 1)), viewsCallRecord("visitAny", 1211, 121, of(1211, 121, 12, 1)), - viewsCallRecord("visitSubView", 1211, 121, of(1211, 121, 12, 1)) - ).iterator(); + viewsCallRecord("visitSubView", 1211, 121, of(1211, 121, 12, 1))).iterator(); verifyCallRecords(expected, visitor.callsRecords.iterator()); } @@ -131,8 +126,7 @@ public class ViewsVisitorsCrawlerWithPathAwareVisitorTest { Iterator expected = of( viewsCallRecord("visitAny", 1, null, of(1)), - viewsCallRecord("visitView", 1, null, of(1)) - ).iterator(); + viewsCallRecord("visitView", 1, null, of(1))).iterator(); verifyCallRecords(expected, visitor.callsRecords.iterator()); } @@ -164,8 +158,7 @@ public class ViewsVisitorsCrawlerWithPathAwareVisitorTest { viewsCallRecord("visitAny", 12, 1, of(12, 1)), viewsCallRecord("visitSubView", 12, 1, of(12, 1)), viewsCallRecord("visitAny", 1, null, of(1)), - viewsCallRecord("visitView", 1, null, of(1)) - ).iterator(); + viewsCallRecord("visitView", 1, null, of(1))).iterator(); verifyCallRecords(expected, visitor.callsRecords.iterator()); } @@ -189,8 +182,7 @@ public class ViewsVisitorsCrawlerWithPathAwareVisitorTest { viewsCallRecord("visitAny", 12, 1, of(12, 1)), viewsCallRecord("visitSubView", 12, 1, of(12, 1)), viewsCallRecord("visitAny", 1, null, of(1)), - viewsCallRecord("visitView", 1, null, of(1)) - ).iterator(); + viewsCallRecord("visitView", 1, null, of(1))).iterator(); verifyCallRecords(expected, visitor.callsRecords.iterator()); } @@ -202,8 +194,7 @@ public class ViewsVisitorsCrawlerWithPathAwareVisitorTest { Iterator expected = of( viewsCallRecord("visitAny", 1, null, of(1)), - viewsCallRecord("visitView", 1, null, of(1)) - ).iterator(); + viewsCallRecord("visitView", 1, null, of(1))).iterator(); verifyCallRecords(expected, visitor.callsRecords.iterator()); } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java index d7171cd4347..541e84d0235 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.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.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.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; public class ViewsVisitorsCrawlerWithPostOrderTypeAwareVisitorTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java index 0be57a40bf3..73684ff7889 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.component; +package org.sonar.ce.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.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; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; public class ViewsVisitorsCrawlerWithPreOrderTypeAwareVisitorTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java index 640c4fc6191..dee5e944cbf 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.container; +package org.sonar.ce.task.projectanalysis.container; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -32,12 +32,12 @@ import org.junit.Test; import org.picocontainer.DefaultPicoContainer; import org.picocontainer.PicoContainer; import org.sonar.ce.queue.CeTask; +import org.sonar.ce.task.projectanalysis.step.PersistComponentsStep; 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.step.StepsExplorer; -import org.sonar.server.computation.task.projectanalysis.step.PersistComponentsStep; import org.sonar.server.computation.task.step.ComputationStep; +import org.sonar.server.computation.task.step.StepsExplorer; import static com.google.common.base.Predicates.notNull; import static com.google.common.collect.FluentIterable.from; @@ -47,7 +47,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; public class ProjectAnalysisTaskContainerPopulatorTest { - private static final String PROJECTANALYSIS_STEP_PACKAGE = "org.sonar.server.computation.task.projectanalysis.step"; + private static final String PROJECTANALYSIS_STEP_PACKAGE = "org.sonar.ce.task.projectanalysis.step"; private CeTask task = mock(CeTask.class); private ProjectAnalysisTaskContainerPopulator underTest; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/dbmigration/DbMigrationModuleTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/dbmigration/DbMigrationModuleTest.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/dbmigration/DbMigrationModuleTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/dbmigration/DbMigrationModuleTest.java index 2928224410d..bd10bb0b73a 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/dbmigration/DbMigrationModuleTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/dbmigration/DbMigrationModuleTest.java @@ -17,7 +17,7 @@ * along with this program; 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.dbmigration; +package org.sonar.ce.task.projectanalysis.dbmigration; import java.util.Objects; import org.junit.Test; @@ -47,7 +47,6 @@ public class DbMigrationModuleTest { assertThat(ProjectAnalysisDataChangesImpl.getDataChangeClasses() .stream() .map(t -> container.getPicoContainer().getComponentAdapter(t)) - .filter(Objects::nonNull) - ).hasSize(ProjectAnalysisDataChangesImpl.getDataChangeClasses().size()); + .filter(Objects::nonNull)).hasSize(ProjectAnalysisDataChangesImpl.getDataChangeClasses().size()); } } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/dbmigration/PopulateFileSourceLineCountTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/dbmigration/PopulateFileSourceLineCountTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/dbmigration/PopulateFileSourceLineCountTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/dbmigration/PopulateFileSourceLineCountTest.java index 87ba32e4b67..5e6a85cb16a 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/dbmigration/PopulateFileSourceLineCountTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/dbmigration/PopulateFileSourceLineCountTest.java @@ -17,7 +17,7 @@ * along with this program; 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.dbmigration; +package org.sonar.ce.task.projectanalysis.dbmigration; import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; @@ -152,10 +152,10 @@ public class PopulateFileSourceLineCountTest { @DataProvider public static Object[][] anyType() { return new Object[][] { - { FileSourceDto.Type.SOURCE}, - { FileSourceDto.Type.TEST}, - { null}, - { randomAlphanumeric(3)}, + {FileSourceDto.Type.SOURCE}, + {FileSourceDto.Type.TEST}, + {null}, + {randomAlphanumeric(3)}, }; } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImplTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImplTest.java index 3886bfa344e..c4bab8b1656 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/dbmigration/ProjectAnalysisDataChangesImplTest.java @@ -17,7 +17,7 @@ * along with this program; 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.dbmigration; +package org.sonar.ce.task.projectanalysis.dbmigration; import java.util.List; import java.util.stream.Collectors; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicateTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/CrossProjectDuplicateTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicateTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/CrossProjectDuplicateTest.java index 723adfdef56..63c873c7462 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicateTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java index d75151cb8ad..b79a42238c2 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.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.task.projectanalysis.duplication; +package org.sonar.ce.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.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.analysis.Branch; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicateTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/DuplicateTest.java similarity index 87% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicateTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/DuplicateTest.java index ffe0a6316da..a3de07c70cb 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicateTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; import org.junit.Test; -import org.sonar.server.computation.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/DuplicationRepositoryImplTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/DuplicationRepositoryImplTest.java index 7ef4d529984..19de964c5ef 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/DuplicationRepositoryImplTest.java @@ -17,18 +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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; import com.tngtech.java.junit.dataprovider.UseDataProvider; import java.util.Arrays; +import org.assertj.core.api.Assertions; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; -import org.sonar.server.computation.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; import org.sonar.server.util.WrapInSingleElementArray; import static com.google.common.base.Predicates.equalTo; @@ -101,7 +102,7 @@ public class DuplicationRepositoryImplTest { underTest.add(FILE_COMPONENT_1, SOME_DUPLICATION); Iterable duplications = underTest.getDuplications(FILE_COMPONENT_1); - assertThat(duplications).hasSize(1); + Assertions.assertThat(duplications).hasSize(1); assertThat(duplications.iterator().next()).isSameAs(SOME_DUPLICATION); assertNoDuplication(FILE_COMPONENT_2); @@ -113,7 +114,7 @@ public class DuplicationRepositoryImplTest { underTest.add(FILE_COMPONENT_1, SOME_DUPLICATION); Iterable duplications = underTest.getDuplications(FILE_COMPONENT_1); - assertThat(duplications).hasSize(1); + Assertions.assertThat(duplications).hasSize(1); assertThat(duplications.iterator().next()).isSameAs(SOME_DUPLICATION); assertNoDuplication(FILE_COMPONENT_2); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/DuplicationRepositoryRule.java similarity index 87% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/DuplicationRepositoryRule.java index 60ea23f0d81..31ba9be8c2a 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.duplication; +package org.sonar.ce.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.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 org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ComponentProvider; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderComponentProvider; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.FluentIterable.from; @@ -92,15 +92,15 @@ public class DuplicationRepositoryRule extends ExternalResource implements Dupli ensureComponentProviderInitialized(); Component component = componentProvider.getByRef(fileRef); checkArgument(!componentRefsWithInnerDuplications.containsEntry(component, original), "Inner duplications for file %s and original %s already set", fileRef, original); - checkArgument(!componentRefsWithInProjectDuplications.containsEntry(component, original), "InProject duplications for file %s and original %s already set. Use add(int, Duplication) instead", fileRef, original); + checkArgument(!componentRefsWithInProjectDuplications.containsEntry(component, original), + "InProject duplications for file %s and original %s already set. Use add(int, Duplication) instead", fileRef, original); componentRefsWithInnerDuplications.put(component, original); delegate.add( component, new Duplication( original, - from(Arrays.asList(duplicates)).transform(TextBlockToInnerDuplicate.INSTANCE)) - ); + from(Arrays.asList(duplicates)).transform(TextBlockToInnerDuplicate.INSTANCE))); return this; } @@ -109,15 +109,14 @@ public class DuplicationRepositoryRule extends ExternalResource implements Dupli ensureComponentProviderInitialized(); Component component = componentProvider.getByRef(fileRef); checkArgument(!componentRefsWithInProjectDuplications.containsEntry(component, original), "InProject duplications for file %s and original %s already set", fileRef, original); - checkArgument(!componentRefsWithInnerDuplications.containsEntry(component, original), "Inner duplications for file %s and original %s already set. Use add(int, Duplication) instead", fileRef, original); + checkArgument(!componentRefsWithInnerDuplications.containsEntry(component, original), + "Inner duplications for file %s and original %s already set. Use add(int, Duplication) instead", fileRef, original); componentRefsWithInProjectDuplications.put(component, original); delegate.add(component, new Duplication( original, - Arrays.asList(new InProjectDuplicate(componentProvider.getByRef(otherFileRef), duplicate)) - ) - ); + Arrays.asList(new InProjectDuplicate(componentProvider.getByRef(otherFileRef), duplicate)))); return this; } @@ -131,9 +130,7 @@ public class DuplicationRepositoryRule extends ExternalResource implements Dupli delegate.add(componentProvider.getByRef(fileRef), new Duplication( original, - Arrays.asList(new CrossProjectDuplicate(otherFileKey, duplicate)) - ) - ); + Arrays.asList(new CrossProjectDuplicate(otherFileKey, duplicate)))); return this; } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/DuplicationTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/DuplicationTest.java index a42e1162187..b9e8f69d587 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.duplication; +package org.sonar.ce.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.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicateTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/InProjectDuplicateTest.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicateTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/InProjectDuplicateTest.java index 981554ec0e6..dcaca8fd953 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InProjectDuplicateTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.server.computation.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; import static org.assertj.core.api.Assertions.assertThat; @@ -91,7 +91,8 @@ public class InProjectDuplicateTest { @Test public void verify_toString() { - assertThat(new InProjectDuplicate(FILE_1, new TextBlock(1, 2)).toString()).isEqualTo("InProjectDuplicate{file=ReportComponent{ref=1, key='key_1', type=FILE}, textBlock=TextBlock{start=1, end=2}}"); + assertThat(new InProjectDuplicate(FILE_1, new TextBlock(1, 2)).toString()) + .isEqualTo("InProjectDuplicate{file=ReportComponent{ref=1, key='key_1', type=FILE}, textBlock=TextBlock{start=1, end=2}}"); } } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicateTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/InnerDuplicateTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicateTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/InnerDuplicateTest.java index 49c9a66f1ca..1920596f876 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/InnerDuplicateTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplicationsTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/IntegrateCrossProjectDuplicationsTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplicationsTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/IntegrateCrossProjectDuplicationsTest.java index f0e4dd58f95..6c21e5e0ac2 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplicationsTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; import java.util.ArrayList; import java.util.Arrays; @@ -28,18 +28,18 @@ import org.junit.Test; import org.sonar.api.config.internal.MapSettings; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; import org.sonar.duplications.block.Block; import org.sonar.duplications.block.ByteArray; -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.task.projectanalysis.component.Component.Type.FILE; -import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; public class IntegrateCrossProjectDuplicationsTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/ReportDuplicationMeasuresTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/ReportDuplicationMeasuresTest.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/ReportDuplicationMeasuresTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/ReportDuplicationMeasuresTest.java index 090d8a24107..25479085477 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/ReportDuplicationMeasuresTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/ReportDuplicationMeasuresTest.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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; import org.junit.Rule; import org.junit.Test; -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.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import static com.google.common.base.Preconditions.checkArgument; import static org.assertj.core.api.Assertions.assertThat; @@ -42,12 +42,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.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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; public class ReportDuplicationMeasuresTest { private static final int ROOT_REF = 1; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlockTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/TextBlockTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlockTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/TextBlockTest.java index 944642c837a..a8e7a8cf368 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/TextBlockTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; import java.util.ArrayList; import java.util.Arrays; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/ViewsDuplicationMeasuresTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/ViewsDuplicationMeasuresTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/ViewsDuplicationMeasuresTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/ViewsDuplicationMeasuresTest.java index 34992105fb4..1e8b50872d4 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/ViewsDuplicationMeasuresTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/duplication/ViewsDuplicationMeasuresTest.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.task.projectanalysis.duplication; +package org.sonar.ce.task.projectanalysis.duplication; import org.junit.Rule; import org.junit.Test; -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.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; @@ -41,11 +41,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.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.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; public class ViewsDuplicationMeasuresTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/event/EventRepositoryImplTest.java similarity index 75% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/event/EventRepositoryImplTest.java index a44717f4ff1..db967b0fce5 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventRepositoryImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.event; +package org.sonar.ce.task.projectanalysis.event; import java.util.Arrays; import org.junit.Test; -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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.ViewsComponent; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -63,22 +63,22 @@ public class EventRepositoryImplTest { @Test public void add_throws_IAE_for_any_component_type_but_PROJECT() { Arrays.stream(Component.Type.values()) - .filter(type -> type != Component.Type.PROJECT) - .map(type -> { - if (type.isReportType()) { - return ReportComponent.builder(type, 1).build(); - } else { - return ViewsComponent.builder(type, 1).build(); - } - }) - .forEach(component -> { - try { - underTest.add(component, EVENT_1); - fail("should have raised an IAE"); - } catch (IllegalArgumentException e) { - assertThat(e).hasMessage("Component must be of type PROJECT"); - } - }); + .filter(type -> type != Component.Type.PROJECT) + .map(type -> { + if (type.isReportType()) { + return ReportComponent.builder(type, 1).build(); + } else { + return ViewsComponent.builder(type, 1).build(); + } + }) + .forEach(component -> { + try { + underTest.add(component, EVENT_1); + fail("should have raised an IAE"); + } catch (IllegalArgumentException e) { + assertThat(e).hasMessage("Component must be of type PROJECT"); + } + }); } @Test diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/event/EventTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/event/EventTest.java index 2b849f07b8e..dd7742a7406 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/event/EventTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.event; +package org.sonar.ce.task.projectanalysis.event; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest.java index 4e4cd7bb328..f56c14a0f59 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.filemove; +package org.sonar.ce.task.projectanalysis.filemove; import java.io.File; import java.io.IOException; @@ -33,6 +33,13 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.Analysis; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.source.SourceLinesHashRepository; import org.sonar.core.hash.SourceLineHashesComputer; import org.sonar.core.util.UuidFactoryFast; import org.sonar.db.DbClient; @@ -41,20 +48,13 @@ import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentTesting; import org.sonar.db.organization.OrganizationDto; import org.sonar.db.source.FileSourceDto; -import org.sonar.server.computation.task.projectanalysis.analysis.Analysis; -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.FileAttributes; -import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesHashRepository; import static java.util.Arrays.stream; 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.task.projectanalysis.component.ReportComponent.builder; -import static org.sonar.server.computation.task.projectanalysis.filemove.FileMoveDetectionStep.MIN_REQUIRED_SCORE; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.filemove.FileMoveDetectionStep.MIN_REQUIRED_SCORE; public class FileMoveDetectionStepTest { @@ -69,7 +69,7 @@ public class FileMoveDetectionStepTest { private static final int FILE_2_REF = 3; private static final int FILE_3_REF = 4; private static final String[] CONTENT1 = { - "package org.sonar.server.computation.task.projectanalysis.filemove;", + "package org.sonar.ce.task.projectanalysis.filemove;", "", "public class Foo {", " public String bar() {", @@ -79,7 +79,7 @@ public class FileMoveDetectionStepTest { }; private static final String[] LESS_CONTENT1 = { - "package org.sonar.server.computation.task.projectanalysis.filemove;", + "package org.sonar.ce.task.projectanalysis.filemove;", "", "public class Foo {", " public String foo() {", @@ -487,14 +487,14 @@ public class FileMoveDetectionStepTest { @Test public void real_life_use_case() throws Exception { analysisMetadataHolder.setBaseAnalysis(ANALYSIS); - for (File f : FileUtils.listFiles(new File("src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1"), null, false)) { + for (File f : FileUtils.listFiles(new File("src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1"), null, false)) { insertFiles(f.getName()); insertContentOfFileInDb(f.getName(), readLines(f)); } Map comps = new HashMap<>(); int i = 1; - for (File f : FileUtils.listFiles(new File("src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2"), null, false)) { + for (File f : FileUtils.listFiles(new File("src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2"), null, false)) { String[] lines = readLines(f); Component c = builder(Component.Type.FILE, i++) .setKey(f.getName()) diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/MatchTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/MatchTest.java index f22f474a92f..01c76679780 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/MatchTest.java @@ -17,7 +17,7 @@ * along with this program; 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.filemove; +package org.sonar.ce.task.projectanalysis.filemove; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScoreTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/MatchesByScoreTest.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScoreTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/MatchesByScoreTest.java index 6e9d224ed0f..aab476ca6e8 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScoreTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.filemove; +package org.sonar.ce.task.projectanalysis.filemove; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -25,10 +25,10 @@ import java.util.Arrays; import java.util.List; import java.util.Random; import org.junit.Test; -import org.sonar.server.computation.task.projectanalysis.filemove.ScoreMatrix.ScoreFile; +import org.sonar.ce.task.projectanalysis.filemove.ScoreMatrix.ScoreFile; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.task.projectanalysis.filemove.FileMoveDetectionStep.MIN_REQUIRED_SCORE; +import static org.sonar.ce.task.projectanalysis.filemove.FileMoveDetectionStep.MIN_REQUIRED_SCORE; public class MatchesByScoreTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/MutableMovedFilesRepositoryImplTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/MutableMovedFilesRepositoryImplTest.java index d592e439df4..4ae7e4564c8 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.filemove; +package org.sonar.ce.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.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.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.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.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-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/MutableMovedFilesRepositoryRule.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/MutableMovedFilesRepositoryRule.java index ae7e8a44a44..a56ce87bd20 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.filemove; +package org.sonar.ce.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.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; public class MutableMovedFilesRepositoryRule extends ExternalResource implements MutableMovedFilesRepository { @CheckForNull diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrixDumperImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/ScoreMatrixDumperImplTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrixDumperImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/ScoreMatrixDumperImplTest.java index 8b159539354..9fdc10d1baa 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/ScoreMatrixDumperImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/ScoreMatrixDumperImplTest.java @@ -17,7 +17,7 @@ * along with this program; 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.filemove; +package org.sonar.ce.task.projectanalysis.filemove; import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; @@ -36,7 +36,7 @@ import org.junit.runner.RunWith; import org.sonar.api.config.Configuration; import org.sonar.api.config.internal.MapSettings; import org.sonar.ce.queue.CeTask; -import org.sonar.server.computation.task.projectanalysis.filemove.ScoreMatrix.ScoreFile; +import org.sonar.ce.task.projectanalysis.filemove.ScoreMatrix.ScoreFile; import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/SourceSimilarityImplTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/filemove/SourceSimilarityImplTest.java index da3c7a913ae..b5a64a43709 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/SourceSimilarityImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.filemove; +package org.sonar.ce.task.projectanalysis.filemove; import java.util.List; import java.util.stream.Collectors; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaExecutionTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/AverageFormulaExecutionTest.java similarity index 75% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaExecutionTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/AverageFormulaExecutionTest.java index 0733ef3ec90..37bd1286a56 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaExecutionTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.formula; +package org.sonar.ce.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.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.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.projectanalysis.period.PeriodHolderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.period.PeriodHolderRule; 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.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; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class AverageFormulaExecutionTest { @@ -81,17 +81,17 @@ public class AverageFormulaExecutionTest { builder(DIRECTORY, 111) .addChildren( builder(Component.Type.FILE, 1111).build(), - builder(Component.Type.FILE, 1112).build() - ).build() - ).build(), + builder(Component.Type.FILE, 1112).build()) + .build()) + .build(), builder(MODULE, 12) .addChildren( builder(DIRECTORY, 121) .addChildren( - builder(Component.Type.FILE, 1211).build() - ).build() - ).build() - ).build(); + builder(Component.Type.FILE, 1211).build()) + .build()) + .build()) + .build(); treeRootHolder.setRoot(project); @@ -124,10 +124,10 @@ public class AverageFormulaExecutionTest { .addChildren( builder(DIRECTORY, 111) .addChildren( - builder(Component.Type.FILE, 1111).build() - ).build() - ).build() - ).build(); + builder(Component.Type.FILE, 1111).build()) + .build()) + .build()) + .build(); treeRootHolder.setRoot(project); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/AverageFormulaTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/AverageFormulaTest.java index bb9907632b2..96e93cc96d9 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.formula; +package org.sonar.ce.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.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.PeriodHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.period.PeriodHolder; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.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.task.projectanalysis.formula.AverageFormula.Builder; +import static org.sonar.ce.task.projectanalysis.formula.AverageFormula.Builder; public class AverageFormulaTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaExecutionTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/DistributionFormulaExecutionTest.java similarity index 73% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaExecutionTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/DistributionFormulaExecutionTest.java index 50556a7ec69..b99eb3ddf5f 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaExecutionTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.formula; +package org.sonar.ce.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.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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.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.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; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class DistributionFormulaExecutionTest { @@ -68,17 +68,17 @@ public class DistributionFormulaExecutionTest { builder(DIRECTORY, 111) .addChildren( builder(Component.Type.FILE, 1111).build(), - builder(Component.Type.FILE, 1112).build() - ).build() - ).build(), + builder(Component.Type.FILE, 1112).build()) + .build()) + .build(), builder(MODULE, 12) .addChildren( builder(DIRECTORY, 121) .addChildren( - builder(Component.Type.FILE, 1211).build() - ).build() - ).build() - ).build(); + builder(Component.Type.FILE, 1211).build()) + .build()) + .build()) + .build(); treeRootHolder.setRoot(project); @@ -106,10 +106,10 @@ public class DistributionFormulaExecutionTest { .addChildren( builder(DIRECTORY, 111) .addChildren( - builder(Component.Type.FILE, 1111).build() - ).build() - ).build() - ).build(); + builder(Component.Type.FILE, 1111).build()) + .build()) + .build()) + .build(); treeRootHolder.setRoot(project); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/DistributionFormulaTest.java similarity index 86% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/DistributionFormulaTest.java index 102303e13dd..7515afe2d65 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.formula; +package org.sonar.ce.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.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.PeriodHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.period.PeriodHolder; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -44,9 +44,9 @@ public class DistributionFormulaTest { CounterInitializationContext counterInitializationContext = mock(CounterInitializationContext.class); CreateMeasureContext projectCreateMeasureContext = new DumbCreateMeasureContext( - ReportComponent.builder(Component.Type.PROJECT, 1).build(), mock(Metric.class), mock(PeriodHolder.class)); + ReportComponent.builder(Component.Type.PROJECT, 1).build(), mock(Metric.class), mock(PeriodHolder.class)); CreateMeasureContext fileCreateMeasureContext = new DumbCreateMeasureContext( - ReportComponent.builder(Component.Type.FILE, 1).build(), mock(Metric.class), mock(PeriodHolder.class)); + ReportComponent.builder(Component.Type.FILE, 1).build(), mock(Metric.class), mock(PeriodHolder.class)); @Test public void check_new_counter_class() { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DumbCreateMeasureContext.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/DumbCreateMeasureContext.java similarity index 80% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DumbCreateMeasureContext.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/DumbCreateMeasureContext.java index 4739699a574..c9e89b12603 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DumbCreateMeasureContext.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/DumbCreateMeasureContext.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.task.projectanalysis.formula; +package org.sonar.ce.task.projectanalysis.formula; -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.PeriodHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolder; public class DumbCreateMeasureContext implements CreateMeasureContext { private final Component component; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/IntSumFormulaTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/IntSumFormulaTest.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/IntSumFormulaTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/IntSumFormulaTest.java index a8bfffea3a3..1bdf830b58a 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/IntSumFormulaTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.formula; +package org.sonar.ce.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.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.PeriodHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.formula.SumFormula.IntSumFormula; +import org.sonar.ce.task.projectanalysis.formula.counter.IntSumCounter; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.period.PeriodHolder; 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.task.projectanalysis.formula.SumFormula.createIntSumFormula; +import static org.sonar.ce.task.projectanalysis.formula.SumFormula.createIntSumFormula; public class IntSumFormulaTest { @@ -49,9 +49,9 @@ public class IntSumFormulaTest { public ExpectedException thrown = ExpectedException.none(); CreateMeasureContext projectCreateMeasureContext = new DumbCreateMeasureContext( - ReportComponent.builder(Component.Type.PROJECT, 1).build(), mock(Metric.class), mock(PeriodHolder.class)); + ReportComponent.builder(Component.Type.PROJECT, 1).build(), mock(Metric.class), mock(PeriodHolder.class)); CreateMeasureContext fileCreateMeasureContext = new DumbCreateMeasureContext( - ReportComponent.builder(Component.Type.FILE, 2).build(), mock(Metric.class), mock(PeriodHolder.class)); + ReportComponent.builder(Component.Type.FILE, 2).build(), mock(Metric.class), mock(PeriodHolder.class)); @Test public void check_create_new_counter_class() { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/LongSumFormulaTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/LongSumFormulaTest.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/LongSumFormulaTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/LongSumFormulaTest.java index 28086768eb4..b2945f8f6d1 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/LongSumFormulaTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.formula; +package org.sonar.ce.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.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.PeriodHolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.formula.counter.LongSumCounter; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.period.PeriodHolder; 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.task.projectanalysis.formula.SumFormula.createLongSumFormula; +import static org.sonar.ce.task.projectanalysis.formula.SumFormula.createLongSumFormula; public class LongSumFormulaTest { @@ -48,9 +48,9 @@ public class LongSumFormulaTest { public ExpectedException thrown = ExpectedException.none(); CreateMeasureContext projectCreateMeasureContext = new DumbCreateMeasureContext( - ReportComponent.builder(Component.Type.PROJECT, 1).build(), mock(Metric.class), mock(PeriodHolder.class)); + ReportComponent.builder(Component.Type.PROJECT, 1).build(), mock(Metric.class), mock(PeriodHolder.class)); CreateMeasureContext fileCreateMeasureContext = new DumbCreateMeasureContext( - ReportComponent.builder(Component.Type.FILE, 2).build(), mock(Metric.class), mock(PeriodHolder.class)); + ReportComponent.builder(Component.Type.FILE, 2).build(), mock(Metric.class), mock(PeriodHolder.class)); @Test public void check_create_new_counter_class() { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java index 4238d9d4d3a..fca007a2c9c 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java @@ -17,7 +17,7 @@ * along with this program; 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.formula; +package org.sonar.ce.task.projectanalysis.formula; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; @@ -25,30 +25,30 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.measures.CoreMetrics; -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.component.TreeRootHolderRule; -import org.sonar.server.computation.task.projectanalysis.formula.counter.IntValue; -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.MetricRepositoryRule; -import org.sonar.server.computation.task.projectanalysis.period.Period; -import org.sonar.server.computation.task.projectanalysis.period.PeriodHolderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.formula.counter.IntValue; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolderRule; 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_COVERAGE_KEY; import static org.sonar.api.measures.CoreMetrics.NEW_LINES_TO_COVER_KEY; -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; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; import static org.sonar.test.ExceptionCauseMatcher.hasType; public class ReportFormulaExecutorComponentVisitorTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormulaExecutionTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/SumFormulaExecutionTest.java similarity index 70% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormulaExecutionTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/SumFormulaExecutionTest.java index 6689cf03903..adc6cf581f4 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormulaExecutionTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.formula; +package org.sonar.ce.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.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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.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.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; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.formula.SumFormula.createIntSumFormula; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class SumFormulaExecutionTest { @@ -69,17 +69,17 @@ public class SumFormulaExecutionTest { builder(DIRECTORY, 111) .addChildren( builder(Component.Type.FILE, 1111).build(), - builder(Component.Type.FILE, 1112).build() - ).build() - ).build(), + builder(Component.Type.FILE, 1112).build()) + .build()) + .build(), builder(MODULE, 12) .addChildren( builder(DIRECTORY, 121) .addChildren( - builder(Component.Type.FILE, 1211).build() - ).build() - ).build() - ).build(); + builder(Component.Type.FILE, 1211).build()) + .build()) + .build()) + .build(); treeRootHolder.setRoot(project); @@ -107,10 +107,10 @@ public class SumFormulaExecutionTest { .addChildren( builder(DIRECTORY, 111) .addChildren( - builder(Component.Type.FILE, 1111).build() - ).build() - ).build() - ).build(); + builder(Component.Type.FILE, 1111).build()) + .build()) + .build()) + .build(); treeRootHolder.setRoot(project); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java index 62cfaee3968..266c68877e6 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.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.task.projectanalysis.formula; +package org.sonar.ce.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.task.projectanalysis.component.PathAwareCrawler; -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.counter.IntValue; -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.MetricRepositoryRule; -import org.sonar.server.computation.task.projectanalysis.period.Period; -import org.sonar.server.computation.task.projectanalysis.period.PeriodHolderRule; +import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.ViewsComponent; +import org.sonar.ce.task.projectanalysis.formula.counter.IntValue; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolderRule; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; @@ -41,13 +41,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_COVERAGE_KEY; import static org.sonar.api.measures.CoreMetrics.NEW_LINES_TO_COVER_KEY; -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.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ViewsFormulaExecutorComponentVisitorTest { private static final int ROOT_REF = 1; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleValueTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/counter/DoubleValueTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleValueTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/counter/DoubleValueTest.java index db892c5dcf3..e7795b37192 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/DoubleValueTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/counter/DoubleValueTest.java @@ -17,7 +17,7 @@ * along with this program; 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.formula.counter; +package org.sonar.ce.task.projectanalysis.formula.counter; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounterTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/counter/IntSumCounterTest.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounterTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/counter/IntSumCounterTest.java index 0e056c25c6c..705df0b8aab 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounterTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.formula.counter; +package org.sonar.ce.task.projectanalysis.formula.counter; import com.google.common.base.Optional; import org.junit.Test; -import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; -import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.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-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntValueTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/counter/IntValueTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntValueTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/counter/IntValueTest.java index edf62d33332..5106b2c3828 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntValueTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/counter/IntValueTest.java @@ -17,7 +17,7 @@ * along with this program; 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.formula.counter; +package org.sonar.ce.task.projectanalysis.formula.counter; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounterTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/counter/LongSumCounterTest.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounterTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/counter/LongSumCounterTest.java index 015083e6f82..94c4ad42db8 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounterTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.formula.counter; +package org.sonar.ce.task.projectanalysis.formula.counter; import com.google.common.base.Optional; import org.junit.Test; -import org.sonar.server.computation.task.projectanalysis.formula.CounterInitializationContext; -import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.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-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongValueTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/counter/LongValueTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongValueTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/counter/LongValueTest.java index 24d82f8ebeb..a6ee9ca48f5 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongValueTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/counter/LongValueTest.java @@ -17,7 +17,7 @@ * along with this program; 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.formula.counter; +package org.sonar.ce.task.projectanalysis.formula.counter; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/RatingValueTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/counter/RatingValueTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/RatingValueTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/counter/RatingValueTest.java index fc4a30459f1..8689aa5a140 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/RatingValueTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/counter/RatingValueTest.java @@ -17,7 +17,7 @@ * along with this program; 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.formula.counter; +package org.sonar.ce.task.projectanalysis.formula.counter; import org.junit.Test; import org.sonar.server.measure.Rating; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtilsTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/coverage/CoverageUtilsTest.java similarity index 87% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtilsTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/formula/coverage/CoverageUtilsTest.java index 8eba464a261..10e22c55cdd 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/coverage/CoverageUtilsTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.formula.coverage; +package org.sonar.ce.task.projectanalysis.formula.coverage; import com.google.common.base.Optional; import java.util.HashMap; @@ -26,17 +26,17 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.ExternalResource; -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.period.Period; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.formula.CounterInitializationContext; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.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.task.projectanalysis.formula.coverage.CoverageUtils.getLongMeasureValue; -import static org.sonar.server.computation.task.projectanalysis.formula.coverage.CoverageUtils.getMeasureVariations; -import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.formula.coverage.CoverageUtils.getLongMeasureValue; +import static org.sonar.ce.task.projectanalysis.formula.coverage.CoverageUtils.getMeasureVariations; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; public class CoverageUtilsTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitorTest.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitorTest.java index 529f1d89d4e..54a1bfd47cc 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Arrays; import java.util.Collections; @@ -26,11 +26,10 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.VisitorsCrawler; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.util.CloseableIterator; -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 +37,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.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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; public class CloseIssuesOnRemovedComponentsVisitorTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/ComponentIssuesRepositoryImplTest.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/ComponentIssuesRepositoryImplTest.java index d43c39f95f9..099cbffe935 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Arrays; import java.util.Collections; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.task.projectanalysis.component.Component; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; public class ComponentIssuesRepositoryImplTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/ComponentIssuesRepositoryRule.java similarity index 82% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/ComponentIssuesRepositoryRule.java index 5396536311b..1dad684a432 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/ComponentIssuesRepositoryRule.java @@ -17,23 +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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Collections; import java.util.List; import javax.annotation.CheckForNull; import org.junit.rules.ExternalResource; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; import org.sonar.core.issue.DefaultIssue; -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.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 { @@ -66,9 +63,9 @@ public class ComponentIssuesRepositoryRule extends ExternalResource implements M public List getIssues(Component component) { checkNotNull(component, "component cannot be null"); // Views has no issues - if (component.getType().equals(PROJECT_VIEW) - || component.getType().equals(SUBVIEW) - || component.getType().equals(VIEW)) { + if (component.getType().equals(Component.Type.PROJECT_VIEW) + || component.getType().equals(Component.Type.SUBVIEW) + || component.getType().equals(Component.Type.VIEW)) { return Collections.emptyList(); } return getIssues(component.getReportAttributes().getRef()); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssuesTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/ComponentsWithUnprocessedIssuesTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssuesTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/ComponentsWithUnprocessedIssuesTest.java index 66ec5da4ed0..73917a71935 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssuesTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Set; import org.junit.Rule; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculatorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/DebtCalculatorTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculatorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/DebtCalculatorTest.java index 67a9d2ebd11..5b2c5eed754 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DebtCalculatorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import org.junit.Test; import org.sonar.api.server.debt.DebtRemediationFunction; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssigneeTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/DefaultAssigneeTest.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssigneeTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/DefaultAssigneeTest.java index 9288356b22f..276f3de688b 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultAssigneeTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/DefaultAssigneeTest.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.CoreProperties; import org.sonar.api.config.internal.MapSettings; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderImpl; +import org.sonar.ce.task.projectanalysis.analysis.Organization; +import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; +import org.sonar.ce.task.projectanalysis.component.TestSettingsRepository; import org.sonar.db.DbTester; import org.sonar.db.organization.OrganizationDto; import org.sonar.db.user.UserDto; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderImpl; -import org.sonar.server.computation.task.projectanalysis.analysis.Organization; -import org.sonar.server.computation.task.projectanalysis.component.ConfigurationRepository; -import org.sonar.server.computation.task.projectanalysis.component.TestSettingsRepository; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultTrackingInputTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/DefaultTrackingInputTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultTrackingInputTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/DefaultTrackingInputTest.java index bace8867544..a334948e576 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DefaultTrackingInputTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/DefaultTrackingInputTest.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.task.projectanalysis.issue; - -import static org.assertj.core.api.Assertions.assertThat; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Collection; - import org.junit.Before; import org.junit.Test; import org.mockito.Mock; @@ -31,6 +28,8 @@ import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.tracking.BlockHashSequence; import org.sonar.core.issue.tracking.LineHashSequence; +import static org.assertj.core.api.Assertions.assertThat; + public class DefaultTrackingInputTest { @Mock private Collection issues; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DumbRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/DumbRule.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DumbRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/DumbRule.java index e6066c8c984..95a6b75c6cb 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/DumbRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.HashSet; import java.util.Set; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregatorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/EffortAggregatorTest.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregatorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/EffortAggregatorTest.java index 44a0c3f6871..55402bffc55 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/EffortAggregatorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import org.junit.Test; import org.sonar.api.utils.Duration; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import org.sonar.core.issue.DefaultIssue; -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-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/FillComponentIssuesVisitorRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/FillComponentIssuesVisitorRule.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/FillComponentIssuesVisitorRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/FillComponentIssuesVisitorRule.java index f12519620f5..2f127b1c082 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/FillComponentIssuesVisitorRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/FillComponentIssuesVisitorRule.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; import org.sonar.core.issue.DefaultIssue; -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.task.projectanalysis.component.ComponentVisitor.Order.POST_ORDER; +import static org.sonar.ce.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-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java index a19a9a940f2..c209bb445a3 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import com.google.common.base.Optional; import java.util.Collections; @@ -31,6 +31,22 @@ import org.sonar.api.issue.Issue; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.MergeBranchComponentUuids; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitor; +import org.sonar.ce.task.projectanalysis.filemove.MovedFilesRepository; +import org.sonar.ce.task.projectanalysis.issue.commonrule.CommonRuleEngineImpl; +import org.sonar.ce.task.projectanalysis.issue.filter.IssueFilter; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolder; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolderRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.AlwaysActiveRulesHolderImpl; +import org.sonar.ce.task.projectanalysis.source.SourceLinesHashRepository; +import org.sonar.ce.task.projectanalysis.source.SourceLinesRepositoryRule; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.tracking.Tracker; import org.sonar.db.DbTester; @@ -43,21 +59,6 @@ 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.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; -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.MergeBranchComponentUuids; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; -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.ActiveRulesHolder; -import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolderRule; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesHashRepository; -import org.sonar.server.computation.task.projectanalysis.qualityprofile.AlwaysActiveRulesHolderImpl; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesRepositoryRule; import static com.google.common.collect.Lists.newArrayList; import static java.util.Arrays.asList; @@ -67,7 +68,6 @@ import static org.mockito.ArgumentMatchers.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.task.projectanalysis.component.ReportComponent.builder; public class IntegrateIssuesVisitorTest { @@ -76,7 +76,7 @@ public class IntegrateIssuesVisitorTest { private static final String FILE_KEY = "FILE_KEY"; private static final int FILE_REF = 2; - private static final Component FILE = builder(Component.Type.FILE, FILE_REF) + private static final Component FILE = ReportComponent.builder(Component.Type.FILE, FILE_REF) .setKey(FILE_KEY) .setUuid(FILE_UUID) .build(); @@ -85,7 +85,7 @@ public class IntegrateIssuesVisitorTest { private static final String PROJECT_UUID = "PROJECT_UUID"; private static final String PROJECT_UUID_ON_BRANCH = "PROJECT_UUID_BRANCH"; private static final int PROJECT_REF = 1; - private static final Component PROJECT = builder(Component.Type.PROJECT, PROJECT_REF) + private static final Component PROJECT = ReportComponent.builder(Component.Type.PROJECT, PROJECT_REF) .setKey(PROJECT_KEY) .setUuid(PROJECT_UUID) .addChildren(FILE) @@ -137,7 +137,8 @@ public class IntegrateIssuesVisitorTest { defaultIssueCaptor = ArgumentCaptor.forClass(DefaultIssue.class); when(movedFilesRepository.getOriginalFile(any(Component.class))).thenReturn(Optional.absent()); - TrackerRawInputFactory rawInputFactory = new TrackerRawInputFactory(treeRootHolder, reportReader, sourceLinesHash, new CommonRuleEngineImpl(), issueFilter, ruleRepository, activeRulesHolder); + TrackerRawInputFactory rawInputFactory = new TrackerRawInputFactory(treeRootHolder, reportReader, sourceLinesHash, new CommonRuleEngineImpl(), issueFilter, ruleRepository, + activeRulesHolder); TrackerBaseInputFactory baseInputFactory = new TrackerBaseInputFactory(issuesLoader, dbTester.getDbClient(), movedFilesRepository); TrackerMergeBranchInputFactory mergeInputFactory = new TrackerMergeBranchInputFactory(issuesLoader, mergeBranchComponentsUuids, dbTester.getDbClient()); tracker = new TrackerExecution(baseInputFactory, rawInputFactory, new Tracker<>()); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssignerTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssueAssignerTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssignerTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssueAssignerTest.java index 9195dea486b..9480f5c53e9 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssignerTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssueAssignerTest.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import org.junit.Rule; 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.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.scm.Changeset; +import org.sonar.ce.task.projectanalysis.scm.ScmInfoRepositoryRule; import org.sonar.core.issue.DefaultIssue; -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.IssueFieldsSetter; import static java.util.stream.Collectors.joining; @@ -36,7 +36,7 @@ import static java.util.stream.IntStream.range; 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.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; public class IssueAssignerTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounterTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssueCounterTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounterTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssueCounterTest.java index 2a8956c4137..e3de14b4160 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounterTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Date; import javax.annotation.Nullable; @@ -26,18 +26,18 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rules.RuleType; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricImpl; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolderRule; import org.sonar.core.issue.DefaultIssue; import org.sonar.db.rule.RuleTesting; -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.TreeRootHolderRule; -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.PeriodHolderRule; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.api.issue.Issue.RESOLUTION_FALSE_POSITIVE; @@ -67,8 +67,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.task.projectanalysis.component.ReportComponent.builder; -import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.INT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.metric.Metric.MetricType.INT; public class IssueCounterTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCreationDateCalculatorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssueCreationDateCalculatorTest.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCreationDateCalculatorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssueCreationDateCalculatorTest.java index 479ec0f7875..9c6520c6998 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCreationDateCalculatorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssueCreationDateCalculatorTest.java @@ -17,7 +17,7 @@ * along with this program; 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.issue; +package org.sonar.ce.task.projectanalysis.issue; import com.google.common.base.Optional; import java.util.Date; @@ -27,21 +27,21 @@ import org.junit.Before; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.rule.RuleKey; +import org.sonar.ce.task.projectanalysis.analysis.Analysis; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.analysis.ScannerPlugin; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolder; +import org.sonar.ce.task.projectanalysis.scm.Changeset; +import org.sonar.ce.task.projectanalysis.scm.ScmInfo; +import org.sonar.ce.task.projectanalysis.scm.ScmInfoRepository; import org.sonar.core.issue.DefaultIssue; import org.sonar.db.protobuf.DbCommons.TextRange; import org.sonar.db.protobuf.DbIssues; import org.sonar.db.protobuf.DbIssues.Flow; import org.sonar.db.protobuf.DbIssues.Location; import org.sonar.db.protobuf.DbIssues.Locations.Builder; -import org.sonar.server.computation.task.projectanalysis.analysis.Analysis; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.task.projectanalysis.analysis.ScannerPlugin; -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 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.issue.IssueFieldsSetter; import static org.mockito.ArgumentMatchers.any; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycleTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssueLifecycleTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycleTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssueLifecycleTest.java index 0b1780c9009..04d1268c18a 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycleTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssueLifecycleTest.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import com.google.common.collect.ImmutableMap; import java.util.Date; import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.Duration; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.analysis.Branch; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.DefaultIssueComment; import org.sonar.core.issue.FieldDiffs; import org.sonar.core.issue.IssueChangeContext; import org.sonar.db.protobuf.DbCommons; import org.sonar.db.protobuf.DbIssues; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; import org.sonar.server.issue.IssueFieldsSetter; import org.sonar.server.issue.workflow.IssueWorkflow; @@ -66,7 +66,6 @@ public class IssueLifecycleTest { private DebtCalculator debtCalculator = mock(DebtCalculator.class); - private IssueLifecycle underTest = new IssueLifecycle(analysisMetadataHolder, issueChangeContext, workflow, updater, debtCalculator); @Test @@ -124,7 +123,8 @@ public class IssueLifecycleTest { assertThat(raw.resolution()).isEqualTo("resolution"); assertThat(raw.status()).isEqualTo("status"); - assertThat(raw.defaultIssueComments()).extracting(DefaultIssueComment::issueKey, DefaultIssueComment::createdAt, DefaultIssueComment::userUuid, DefaultIssueComment::markdownText) + assertThat(raw.defaultIssueComments()) + .extracting(DefaultIssueComment::issueKey, DefaultIssueComment::createdAt, DefaultIssueComment::userUuid, DefaultIssueComment::markdownText) .containsOnly(tuple("raw", commentDate, "user_uuid", "A comment")); assertThat(raw.changes()).hasSize(2); assertThat(raw.changes().get(0).creationDate()).isEqualTo(diffDate); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueTrackingDelegatorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssueTrackingDelegatorTest.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueTrackingDelegatorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssueTrackingDelegatorTest.java index 69d84ffe759..54ec793ce67 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueTrackingDelegatorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssueTrackingDelegatorTest.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.tracking.Tracking; import org.sonar.db.component.BranchType; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; -import org.sonar.server.computation.task.projectanalysis.component.Component; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssuesRepositoryVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssuesRepositoryVisitorTest.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssuesRepositoryVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssuesRepositoryVisitorTest.java index 15244b8f89b..7dfd503fba8 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssuesRepositoryVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssuesRepositoryVisitorTest.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.task.projectanalysis.issue; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +package org.sonar.ce.task.projectanalysis.issue; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; public class IssuesRepositoryVisitorTest { static final String FILE_UUID = "FILE_UUID"; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java similarity index 76% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java index 4510b3bd139..b0ff0d8bb24 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java @@ -17,23 +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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Arrays; import org.junit.Test; -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 org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.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.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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; public class LoadComponentUuidsHavingOpenIssuesVisitorTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/MergeBranchTrackerExecutionTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/MergeBranchTrackerExecutionTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/MergeBranchTrackerExecutionTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/MergeBranchTrackerExecutionTest.java index 96cc0c018f2..d3b3e538ae0 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/MergeBranchTrackerExecutionTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/MergeBranchTrackerExecutionTest.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.task.projectanalysis.issue; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +package org.sonar.ce.task.projectanalysis.issue; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.tracking.Input; import org.sonar.core.issue.tracking.Tracker; import org.sonar.core.issue.tracking.Tracking; -import org.sonar.server.computation.task.projectanalysis.component.Component; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; public class MergeBranchTrackerExecutionTest { @Mock diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/MovedIssueVisitorTest.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/MovedIssueVisitorTest.java index b52486d250f..3589f98ea8d 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import com.google.common.base.Optional; import java.util.Date; @@ -25,12 +25,12 @@ import org.junit.Before; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.ArgumentCaptor; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.filemove.MovedFilesRepository; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.IssueChangeContext; -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.IssueFieldsSetter; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregatorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/NewEffortAggregatorTest.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregatorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/NewEffortAggregatorTest.java index b79a16f4efb..ec967e57664 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/NewEffortAggregatorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/NewEffortAggregatorTest.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.Date; import java.util.Random; import org.junit.Test; import org.sonar.api.rules.RuleType; import org.sonar.api.utils.Duration; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolderRule; import org.sonar.core.issue.DefaultIssue; -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.PeriodHolderRule; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RemoveProcessedComponentsVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/RemoveProcessedComponentsVisitorTest.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RemoveProcessedComponentsVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/RemoveProcessedComponentsVisitorTest.java index 65a9b5e5eb8..34672262745 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RemoveProcessedComponentsVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/RemoveProcessedComponentsVisitorTest.java @@ -17,7 +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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; + +import com.google.common.base.Optional; +import org.junit.Before; +import org.junit.Test; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.filemove.MovedFilesRepository; +import org.sonar.ce.task.projectanalysis.filemove.MovedFilesRepository.OriginalFile; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; @@ -25,14 +32,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import org.junit.Before; -import org.junit.Test; -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 com.google.common.base.Optional; - public class RemoveProcessedComponentsVisitorTest { private static final String UUID = "uuid"; private ComponentsWithUnprocessedIssues componentsWithUnprocessedIssues = mock(ComponentsWithUnprocessedIssues.class); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/RuleRepositoryImplTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/RuleRepositoryImplTest.java index 9cffff2f8f0..623c082f094 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -29,6 +29,7 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rules.RuleType; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.DbTester; @@ -36,7 +37,6 @@ import org.sonar.db.rule.DeprecatedRuleKeyDto; import org.sonar.db.rule.RuleDao; import org.sonar.db.rule.RuleDefinitionDto; import org.sonar.db.rule.RuleDto; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; import org.sonar.server.rule.ExternalRuleCreator; import org.sonar.server.rule.NewExternalRule; import org.sonar.server.rule.index.RuleIndexer; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/RuleRepositoryRule.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/RuleRepositoryRule.java index 92ec30c8ebe..5044fcd2c77 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/RuleRepositoryRule.java @@ -17,13 +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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.util.HashMap; import java.util.Map; import java.util.Optional; import java.util.function.Supplier; - import org.junit.rules.ExternalResource; import org.sonar.api.rule.RuleKey; import org.sonar.db.DbSession; @@ -68,7 +67,8 @@ public class RuleRepositoryRule extends ExternalResource implements RuleReposito return Optional.ofNullable(rulesById.get(id)); } - @Override public void persistNewExternalRules(DbSession dbSession) { + @Override + public void persistNewExternalRules(DbSession dbSession) { throw new UnsupportedOperationException(); } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopierTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/RuleTagsCopierTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopierTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/RuleTagsCopierTest.java index e235833b725..cf6ae7001ab 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopierTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import com.google.common.collect.Sets; import java.util.Collections; import org.junit.Test; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; -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-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopierTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/RuleTypeCopierTest.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopierTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/RuleTypeCopierTest.java index 8fa8112345c..906a15cd4e3 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTypeCopierTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import org.junit.Test; import org.sonar.api.rules.RuleType; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; -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-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java index cea138a11e1..495eaa383fc 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java @@ -17,19 +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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; -import java.util.Collections; import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.analysis.Organization; import org.sonar.db.DbTester; import org.sonar.db.organization.OrganizationDto; import org.sonar.db.user.UserDto; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.task.projectanalysis.analysis.Organization; import org.sonar.server.es.EsTester; import org.sonar.server.user.index.UserIndex; import org.sonar.server.user.index.UserIndexer; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ShortBranchIssueMergerTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/ShortBranchIssueMergerTest.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ShortBranchIssueMergerTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/ShortBranchIssueMergerTest.java index a171b7a932b..093c985529a 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ShortBranchIssueMergerTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/ShortBranchIssueMergerTest.java @@ -17,7 +17,7 @@ * along with this program; 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.issue; +package org.sonar.ce.task.projectanalysis.issue; import java.time.Instant; import java.time.temporal.ChronoUnit; @@ -32,6 +32,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.sonar.api.issue.Issue; import org.sonar.api.rule.RuleKey; +import org.sonar.ce.task.projectanalysis.component.ShortBranchComponentsWithIssues; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.FieldDiffs; import org.sonar.core.issue.tracking.SimpleTracker; @@ -42,15 +44,13 @@ import org.sonar.db.issue.IssueDto; import org.sonar.db.issue.IssueTesting; import org.sonar.db.rule.RuleDefinitionDto; import org.sonar.db.user.UserDto; -import org.sonar.server.computation.task.projectanalysis.component.ShortBranchComponentsWithIssues; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; import static org.sonar.db.component.ComponentTesting.newFileDto; -import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; public class ShortBranchIssueMergerTest { @Mock @@ -61,7 +61,7 @@ public class ShortBranchIssueMergerTest { @Rule public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule() - .setRoot(builder(org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT, PROJECT_REF).setKey(PROJECT_KEY).setUuid(PROJECT_UUID) + .setRoot(builder(org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT, PROJECT_REF).setKey(PROJECT_KEY).setUuid(PROJECT_UUID) .addChildren(FILE_1) .build()); @@ -72,8 +72,8 @@ public class ShortBranchIssueMergerTest { private static final String FILE_1_KEY = "fileKey"; private static final String FILE_1_UUID = "fileUuid"; - 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) + private static final org.sonar.ce.task.projectanalysis.component.Component FILE_1 = builder( + org.sonar.ce.task.projectanalysis.component.Component.Type.FILE, FILE_1_REF) .setKey(FILE_1_KEY) .setUuid(FILE_1_UUID) .build(); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ShortBranchTrackerExecutionTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/ShortBranchTrackerExecutionTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ShortBranchTrackerExecutionTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/ShortBranchTrackerExecutionTest.java index d18d535f15e..56bd37db130 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ShortBranchTrackerExecutionTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/ShortBranchTrackerExecutionTest.java @@ -17,23 +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.task.projectanalysis.issue; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.when; -import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +package org.sonar.ce.task.projectanalysis.issue; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; - import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.sonar.api.rule.RuleKey; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.tracking.BlockHashSequence; import org.sonar.core.issue.tracking.Input; @@ -41,7 +37,10 @@ import org.sonar.core.issue.tracking.LineHashSequence; import org.sonar.core.issue.tracking.Tracker; import org.sonar.core.issue.tracking.Tracking; import org.sonar.db.rule.RuleTesting; -import org.sonar.server.computation.task.projectanalysis.component.Component; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; public class ShortBranchTrackerExecutionTest { static final String FILE_UUID = "FILE_UUID"; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactoryTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/TrackerBaseInputFactoryTest.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactoryTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/TrackerBaseInputFactoryTest.java index a02e18738bf..d91235cc066 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactoryTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/TrackerBaseInputFactoryTest.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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import com.google.common.base.Optional; import org.junit.Before; import org.junit.Test; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.filemove.MovedFilesRepository; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.source.FileSourceDao; -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.ArgumentMatchers.any; import static org.mockito.Mockito.mock; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactoryTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/TrackerRawInputFactoryTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactoryTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/TrackerRawInputFactoryTest.java index 6640bd2c2ad..a485e760570 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactoryTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import com.google.common.collect.Iterators; import java.util.Collection; @@ -28,21 +28,21 @@ import org.sonar.api.issue.Issue; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; import org.sonar.api.utils.Duration; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.issue.commonrule.CommonRuleEngine; +import org.sonar.ce.task.projectanalysis.issue.filter.IssueFilter; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolderRule; +import org.sonar.ce.task.projectanalysis.source.SourceLinesHashRepository; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.tracking.Input; import org.sonar.db.protobuf.DbIssues; 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.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.TreeRootHolderRule; -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.qualityprofile.ActiveRule; -import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRulesHolderRule; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesHashRepository; import org.sonar.server.rule.CommonRuleKeys; import static java.util.Arrays.asList; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolverTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/UpdateConflictResolverTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolverTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/UpdateConflictResolverTest.java index 34fa2bca313..0a5a2c82289 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/UpdateConflictResolverTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/UpdateConflictResolverTest.java @@ -17,14 +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.task.projectanalysis.issue; +package org.sonar.ce.task.projectanalysis.issue; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.sonar.api.issue.Issue; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; -import org.sonar.api.rules.RuleType; import org.sonar.api.utils.DateUtils; import org.sonar.core.issue.DefaultIssue; import org.sonar.db.issue.IssueDto; @@ -64,8 +63,7 @@ public class UpdateConflictResolverTest { .setStatus(STATUS_OPEN) // field changed by user - .setAssigneeUuid("arthur-uuid") - ); + .setAssigneeUuid("arthur-uuid")); new UpdateConflictResolver().resolve(issue, mapper); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRuleTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/commonrule/BranchCoverageRuleTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRuleTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/commonrule/BranchCoverageRuleTest.java index 08856112b38..57488db4910 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/BranchCoverageRuleTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue.commonrule; +package org.sonar.ce.task.projectanalysis.issue.commonrule; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rule.RuleKey; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRuleTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CommentDensityRuleTest.java similarity index 86% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRuleTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CommentDensityRuleTest.java index 7c3fb19deda..ec4f71a2567 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommentDensityRuleTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue.commonrule; +package org.sonar.ce.task.projectanalysis.issue.commonrule; import com.google.common.collect.ImmutableMap; import org.junit.Rule; @@ -26,20 +26,20 @@ import org.junit.rules.ExpectedException; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolderRule; import org.sonar.core.issue.DefaultIssue; -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.TreeRootHolderRule; -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.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; public class CommentDensityRuleTest { @@ -115,8 +115,8 @@ public class CommentDensityRuleTest { } /** - * SQALE-110 - */ + * SQALE-110 + */ @Test public void fail_if_min_density_is_100() { thrown.expect(IllegalStateException.class); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CommonRuleEngineImplTest.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CommonRuleEngineImplTest.java index 43586f9a260..13138ac2715 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue.commonrule; +package org.sonar.ce.task.projectanalysis.issue.commonrule; import java.util.Collection; import org.junit.Test; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; import org.sonar.core.issue.DefaultIssue; -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 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.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; public class CommonRuleEngineImplTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CommonRuleTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CommonRuleTest.java index 2444726563f..128c0ae3b35 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CommonRuleTest.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.task.projectanalysis.issue.commonrule; +package org.sonar.ce.task.projectanalysis.issue.commonrule; import com.google.common.collect.ImmutableMap; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.rule.Severity; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; import org.sonar.db.rule.RuleTesting; -import org.sonar.server.computation.task.projectanalysis.qualityprofile.ActiveRule; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CoverageRuleTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CoverageRuleTest.java similarity index 82% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CoverageRuleTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/commonrule/CoverageRuleTest.java index 2e94c73d00e..c55caee50fd 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CoverageRuleTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue.commonrule; +package org.sonar.ce.task.projectanalysis.issue.commonrule; import com.google.common.collect.ImmutableMap; import org.junit.Before; @@ -26,19 +26,18 @@ import org.junit.Test; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolderRule; import org.sonar.core.issue.DefaultIssue; -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.TreeRootHolderRule; -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.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; public abstract class CoverageRuleTest { @@ -70,7 +69,7 @@ public abstract class CoverageRuleTest { @Before public void setUp() { - treeRootHolder.setRoot(DUMB_PROJECT); + treeRootHolder.setRoot(ReportComponent.DUMB_PROJECT); } protected abstract CommonRule createRule(); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRuleTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/commonrule/DuplicatedBlockRuleTest.java similarity index 76% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRuleTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/commonrule/DuplicatedBlockRuleTest.java index 5edfa184397..a42debf60b1 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRuleTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue.commonrule; +package org.sonar.ce.task.projectanalysis.issue.commonrule; import java.util.Collections; import org.junit.Rule; @@ -25,20 +25,19 @@ import org.junit.Test; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolderRule; import org.sonar.core.issue.DefaultIssue; -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.TreeRootHolderRule; -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.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; public class DuplicatedBlockRuleTest { @@ -58,7 +57,7 @@ public class DuplicatedBlockRuleTest { .add(CoreMetrics.DUPLICATED_BLOCKS); @Rule - public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule().setRoot(DUMB_PROJECT); + public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule().setRoot(ReportComponent.DUMB_PROJECT); @Rule public MeasureRepositoryRule measureRepository = MeasureRepositoryRule.create(treeRootHolder, metricRepository); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRuleTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/commonrule/LineCoverageRuleTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRuleTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/commonrule/LineCoverageRuleTest.java index 99aaa173aac..fc31fd34519 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/LineCoverageRuleTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue.commonrule; +package org.sonar.ce.task.projectanalysis.issue.commonrule; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rule.RuleKey; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRuleTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/commonrule/SkippedTestRuleTest.java similarity index 77% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRuleTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/commonrule/SkippedTestRuleTest.java index 29bf5c5df11..d2ac27d05d0 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRuleTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue.commonrule; +package org.sonar.ce.task.projectanalysis.issue.commonrule; import java.util.Collections; import org.junit.Rule; @@ -25,20 +25,19 @@ import org.junit.Test; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolderRule; import org.sonar.core.issue.DefaultIssue; -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.TreeRootHolderRule; -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.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; public class SkippedTestRuleTest { @@ -59,7 +58,7 @@ public class SkippedTestRuleTest { .add(CoreMetrics.SKIPPED_TESTS); @Rule - public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule().setRoot(DUMB_PROJECT); + public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule().setRoot(ReportComponent.DUMB_PROJECT); @Rule public MeasureRepositoryRule measureRepository = MeasureRepositoryRule.create(treeRootHolder, metricRepository); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRuleTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/commonrule/TestErrorRuleTest.java similarity index 80% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRuleTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/commonrule/TestErrorRuleTest.java index a6ac2740f33..e8338296601 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRuleTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue.commonrule; +package org.sonar.ce.task.projectanalysis.issue.commonrule; import java.util.Collections; import org.junit.Rule; @@ -25,20 +25,20 @@ import org.junit.Test; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolderRule; import org.sonar.core.issue.DefaultIssue; -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.TreeRootHolderRule; -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.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; public class TestErrorRuleTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilterTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/filter/IssueFilterTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilterTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/filter/IssueFilterTest.java index 9881df88b58..16d2432441d 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilterTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/filter/IssueFilterTest.java @@ -17,7 +17,7 @@ * along with this program; 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.issue.filter; +package org.sonar.ce.task.projectanalysis.issue.filter; import com.google.common.base.Joiner; import java.util.ArrayList; @@ -29,17 +29,17 @@ import org.junit.rules.ExpectedException; import org.sonar.api.config.Settings; import org.sonar.api.config.internal.MapSettings; import org.sonar.api.rule.RuleKey; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; import org.sonar.core.issue.DefaultIssue; -import org.sonar.server.computation.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.component.ConfigurationRepository; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; 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.task.projectanalysis.component.Component.Type.FILE; -import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; public class IssueFilterTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePatternTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/filter/IssuePatternTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePatternTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/filter/IssuePatternTest.java index 117c4936c53..8b10ca26a72 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssuePatternTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.issue.filter; +package org.sonar.ce.task.projectanalysis.issue.filter; import org.junit.Test; import org.sonar.api.rule.RuleKey; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/language/LanguageRepositoryImplTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/language/LanguageRepositoryImplTest.java index a105aee6205..a24300e79b4 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/language/LanguageRepositoryImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.language; +package org.sonar.ce.task.projectanalysis.language; import com.google.common.base.Optional; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasureTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/BatchMeasureToMeasureTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasureTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/BatchMeasureToMeasureTest.java index 7793c506335..3e46760891c 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BatchMeasureToMeasureTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/BatchMeasureToMeasureTest.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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import com.google.common.base.Optional; import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; import org.junit.Test; import org.junit.runner.RunWith; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricImpl; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.Measure.BoolValue; 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.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; @@ -97,8 +97,8 @@ public class BatchMeasureToMeasureTest { } private void verify_toMeasure_returns_value_for_LEVEL_Metric(Measure.Level expectedQualityGateStatus) { - Optional measure = - underTest.toMeasure(ScannerReport.Measure.newBuilder().setStringValue(StringValue.newBuilder().setValue(expectedQualityGateStatus.name())).build(), SOME_LEVEL_METRIC); + Optional measure = underTest.toMeasure(ScannerReport.Measure.newBuilder().setStringValue(StringValue.newBuilder().setValue(expectedQualityGateStatus.name())).build(), + SOME_LEVEL_METRIC); assertThat(measure).isPresent(); assertThat(measure.get().getValueType()).isEqualTo(Measure.ValueType.LEVEL); assertThat(measure.get().getLevelValue()).isEqualTo(expectedQualityGateStatus); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimizationTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/BestValueOptimizationTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimizationTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/BestValueOptimizationTest.java index 0814849dd52..8ee050c822a 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimizationTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import java.util.function.Predicate; import org.junit.Test; -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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricImpl; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; import static org.sonar.server.measure.Rating.A; import static org.sonar.server.measure.Rating.B; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/LiveMeasureDtoToMeasureTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/LiveMeasureDtoToMeasureTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/LiveMeasureDtoToMeasureTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/LiveMeasureDtoToMeasureTest.java index b3b8384ad46..83552d3b4ee 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/LiveMeasureDtoToMeasureTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/LiveMeasureDtoToMeasureTest.java @@ -17,7 +17,7 @@ * along with this program; 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.measure; +package org.sonar.ce.task.projectanalysis.measure; import com.google.common.base.Optional; import com.tngtech.java.junit.dataprovider.DataProvider; @@ -28,10 +28,10 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; +import org.sonar.ce.task.projectanalysis.measure.Measure.Level; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricImpl; import org.sonar.db.measure.LiveMeasureDto; -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-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java index 4820393d466..fad761f8ffa 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -37,18 +37,18 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Developer; +import org.sonar.ce.task.projectanalysis.component.DumbDeveloper; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricImpl; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.metric.ReportMetricValidator; import org.sonar.db.DbClient; import org.sonar.db.DbTester; import org.sonar.db.rule.RuleDto; -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-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureAssert.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureAssert.java similarity index 99% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureAssert.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureAssert.java index 10c40287387..f0c1008d38f 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureAssert.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import com.google.common.base.Optional; import java.util.Objects; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureComputersHolderImplTest.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureComputersHolderImplTest.java index cdfa5fa1d7b..f07c02cb7e8 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.measure; +package org.sonar.ce.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.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; +import org.sonar.ce.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureComputersHolderRule.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureComputersHolderRule.java index 26e4dd21faf..a1fe3018de5 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.measure; +package org.sonar.ce.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.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; +import org.sonar.ce.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; import static java.util.Objects.requireNonNull; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasureTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureDtoToMeasureTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasureTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureDtoToMeasureTest.java index 54a57eb0dca..23cda6c1527 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureDtoToMeasureTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import com.google.common.base.Optional; import com.tngtech.java.junit.dataprovider.DataProvider; @@ -28,10 +28,10 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; +import org.sonar.ce.task.projectanalysis.measure.Measure.Level; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricImpl; import org.sonar.db.measure.MeasureDto; -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-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKeyTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureKeyTest.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKeyTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureKeyTest.java index 7a7f9b3d3b9..cf9424ed064 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKeyTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.server.computation.task.projectanalysis.component.Developer; -import org.sonar.server.computation.task.projectanalysis.component.DumbDeveloper; +import org.sonar.ce.task.projectanalysis.component.Developer; +import org.sonar.ce.task.projectanalysis.component.DumbDeveloper; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureLevelTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureLevelTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureLevelTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureLevelTest.java index 87c066c71cc..c726580c562 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureLevelTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureLevelTest.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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import org.junit.Test; -import static org.assertj.guava.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.guava.api.Assertions.assertThat; public class MeasureLevelTest { @Test diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepoEntry.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepoEntry.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepoEntry.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepoEntry.java index 62c36f25776..f9fbc9f3f6b 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepoEntry.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.measure; +package org.sonar.ce.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.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; /** * This class represents a metric key and an associated measure. diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImplTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImplTest.java index 5d438058d58..c834a8b826f 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -35,20 +35,20 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricImpl; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; +import org.sonar.ce.task.projectanalysis.metric.ReportMetricValidator; import org.sonar.db.DbClient; import org.sonar.db.DbSession; 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.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-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryRule.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryRule.java index abd880eb5d4..3f304f5d15d 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -33,16 +33,16 @@ import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.junit.rules.ExternalResource; -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 org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ComponentProvider; +import org.sonar.ce.task.projectanalysis.component.Developer; +import org.sonar.ce.task.projectanalysis.component.DumbDeveloper; +import org.sonar.ce.task.projectanalysis.component.NoComponentProvider; +import org.sonar.ce.task.projectanalysis.component.TreeComponentProvider; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderComponentProvider; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; @@ -184,6 +184,7 @@ public class MeasureRepositoryRule extends ExternalResource implements MeasureRe return this; } + @Override public Optional getBaseMeasure(Component component, Metric metric) { return Optional.fromNullable(baseMeasures.get(new InternalKey(component, metric))); @@ -192,7 +193,7 @@ public class MeasureRepositoryRule extends ExternalResource implements MeasureRe public Collection getComponentsLoadedAsRaw() { return loadedAsRawComponents; } - + public Collection getMetricsLoadedAsRaw() { return loadedAsRawMetrics; } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureTest.java index 4321773f939..235b9597f38 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.measure; +package org.sonar.ce.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.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.ce.task.projectanalysis.component.Developer; +import org.sonar.ce.task.projectanalysis.component.DumbDeveloper; +import org.sonar.ce.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.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; @RunWith(DataProviderRunner.class) public class MeasureTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDtoTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureToMeasureDtoTest.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDtoTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MeasureToMeasureDtoTest.java index 5e1c66b0dc7..6f9c8f8f7a4 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureToMeasureDtoTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; @@ -26,14 +26,14 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; +import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.MutableTreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricImpl; import org.sonar.db.measure.LiveMeasureDto; import org.sonar.db.measure.MeasureDto; -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.MutableTreeRootHolderRule; -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-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/PostMeasuresComputationChecksStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/PostMeasuresComputationChecksStepTest.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/PostMeasuresComputationChecksStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/PostMeasuresComputationChecksStepTest.java index f9a3579a980..3a8a22e8b73 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/PostMeasuresComputationChecksStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/PostMeasuresComputationChecksStepTest.java @@ -17,7 +17,7 @@ * along with this program; 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.measure; +package org.sonar.ce.task.projectanalysis.measure; import org.junit.Rule; import org.junit.Test; @@ -25,10 +25,10 @@ import org.junit.rules.ExpectedException; import org.mockito.ArgumentCaptor; import org.mockito.InOrder; import org.sonar.api.measures.CoreMetrics; -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.measure.PostMeasuresComputationCheck.Context; -import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.PostMeasuresComputationCheck.Context; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import org.sonar.server.project.Project; import static org.assertj.core.api.Assertions.assertThat; @@ -40,7 +40,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.sonar.api.measures.CoreMetrics.NCLOC; -import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.DUMB_PROJECT; public class PostMeasuresComputationChecksStepTest { @@ -131,7 +131,7 @@ public class PostMeasuresComputationChecksStepTest { } private PostMeasuresComputationChecksStep newStep(PostMeasuresComputationCheck... postMeasuresComputationChecks) { - if (postMeasuresComputationChecks.length == 0){ + if (postMeasuresComputationChecks.length == 0) { return new PostMeasuresComputationChecksStep(treeRootHolder, metricRepository, measureRepository, analysisMetadataHolder); } return new PostMeasuresComputationChecksStep(treeRootHolder, metricRepository, measureRepository, analysisMetadataHolder, postMeasuresComputationChecks); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatusTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/QualityGateStatusTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatusTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/QualityGateStatusTest.java index fc28345dd62..4634ca06317 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/QualityGateStatusTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.measure; +package org.sonar.ce.task.projectanalysis.measure; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java similarity index 79% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java index 00d819c0f1e..d0da23650a8 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java @@ -17,21 +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.task.projectanalysis.measure; +package org.sonar.ce.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.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 org.sonar.ce.task.projectanalysis.api.measurecomputer.MeasureComputerDefinitionImpl; +import org.sonar.ce.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.VisitorsCrawler; +import org.sonar.ce.task.projectanalysis.issue.ComponentIssuesRepository; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; @@ -40,14 +39,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.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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ReportMeasureComputersVisitorTest { @@ -56,7 +55,7 @@ public class ReportMeasureComputersVisitorTest { private static final org.sonar.api.measures.Metric NEW_METRIC = new org.sonar.api.measures.Metric.Builder(NEW_METRIC_KEY, NEW_METRIC_NAME, org.sonar.api.measures.Metric.ValueType.INT) - .create(); + .create(); private static final int ROOT_REF = 1; private static final int MODULE_REF = 12; @@ -71,10 +70,10 @@ public class ReportMeasureComputersVisitorTest { builder(DIRECTORY, DIRECTORY_REF).setKey("directory") .addChildren( builder(FILE, FILE_1_REF).setKey("file1").build(), - builder(FILE, FILE_2_REF).setKey("file2").build() - ).build() - ).build() - ).build(); + builder(FILE, FILE_2_REF).setKey("file2").build()) + .build()) + .build()) + .build(); @Rule public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule().setRoot(ROOT); @@ -126,8 +125,7 @@ public class ReportMeasureComputersVisitorTest { } } }, - definition - ))); + definition))); VisitorsCrawler visitorsCrawler = new VisitorsCrawler(Arrays.asList(new MeasureComputersVisitor(metricRepository, measureRepository, null, measureComputersHolder, componentIssuesRepository))); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java similarity index 86% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java index 43365239c12..3fbbe717898 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java @@ -17,20 +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.task.projectanalysis.measure; +package org.sonar.ce.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.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 org.sonar.ce.task.projectanalysis.api.measurecomputer.MeasureComputerDefinitionImpl; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.VisitorsCrawler; +import org.sonar.ce.task.projectanalysis.issue.ComponentIssuesRepository; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -38,13 +37,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.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.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ViewsMeasureComputersVisitorTest { @@ -53,7 +52,7 @@ public class ViewsMeasureComputersVisitorTest { private static final org.sonar.api.measures.Metric NEW_METRIC = new org.sonar.api.measures.Metric.Builder(NEW_METRIC_KEY, NEW_METRIC_NAME, org.sonar.api.measures.Metric.ValueType.INT) - .create(); + .create(); private static final int ROOT_REF = 1; private static final int VIEW_REF = 12; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedConditionTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/qualitygatedetails/EvaluatedConditionTest.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedConditionTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/qualitygatedetails/EvaluatedConditionTest.java index 39da3bb8c9e..603cdd8df33 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/EvaluatedConditionTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.measure.qualitygatedetails; +package org.sonar.ce.task.projectanalysis.measure.qualitygatedetails; import org.junit.Test; -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 org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.qualitygate.Condition; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java index 520d8f73c3a..822833eb062 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.measure.qualitygatedetails; +package org.sonar.ce.task.projectanalysis.measure.qualitygatedetails; import com.google.common.collect.ImmutableList; import java.util.Collections; import org.junit.Test; -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.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricImpl; +import org.sonar.ce.task.projectanalysis.qualitygate.Condition; import org.sonar.test.JsonAssert; public class QualityGateDetailsDataTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetricTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/metric/MetricDtoToMetricTest.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetricTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/metric/MetricDtoToMetricTest.java index a41c519dcba..25e56aaf5d4 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricDtoToMetricTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.metric; +package org.sonar.ce.task.projectanalysis.metric; import org.junit.Test; import org.sonar.db.metric.MetricDto; @@ -62,11 +62,11 @@ public class MetricDtoToMetricTest { private static MetricDto createMetricDto(Metric.MetricType metricType) { return new MetricDto() - .setId(metricType.name().hashCode()) - .setKey(metricType.name() + "_key") - .setShortName(metricType.name() + "_name") - .setValueType(metricType.name()) - .setBestValue(SOME_BEST_VALUE) - .setEnabled(true); + .setId(metricType.name().hashCode()) + .setKey(metricType.name() + "_key") + .setShortName(metricType.name() + "_name") + .setValueType(metricType.name()) + .setBestValue(SOME_BEST_VALUE) + .setEnabled(true); } } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/metric/MetricImplTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/metric/MetricImplTest.java index b45db568918..91c2030b3d9 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.metric; +package org.sonar.ce.task.projectanalysis.metric; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/metric/MetricRepositoryImplTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/metric/MetricRepositoryImplTest.java index 525bdc980ee..359a531b06b 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.metric; +package org.sonar.ce.task.projectanalysis.metric; import org.junit.Rule; import org.junit.Test; @@ -28,7 +28,6 @@ import org.sonar.db.DbTester; import static org.assertj.core.api.Assertions.assertThat; - public class MetricRepositoryImplTest { private static final String SOME_KEY = "some_key"; private static final long SOME_ID = 156; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/metric/MetricRepositoryRule.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/metric/MetricRepositoryRule.java index 1fff9f6f311..af1c0ce4664 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.metric; +package org.sonar.ce.task.projectanalysis.metric; import java.util.HashMap; import java.util.Map; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/metric/ReportMetricValidatorImplTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/metric/ReportMetricValidatorImplTest.java index 41b0898291f..3925b9f7cbb 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/metric/ReportMetricValidatorImplTest.java @@ -17,13 +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.task.projectanalysis.metric; +package org.sonar.ce.task.projectanalysis.metric; import com.google.common.collect.ImmutableSet; import java.util.Collections; import org.junit.Rule; import org.junit.Test; -import org.sonar.api.measures.Metric; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; import org.sonar.core.metric.ScannerMetrics; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/period/PeriodHolderImplTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/period/PeriodHolderImplTest.java index cf258f4c40e..3c3e4966815 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/period/PeriodHolderImplTest.java @@ -17,7 +17,7 @@ * along with this program; 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.period; +package org.sonar.ce.task.projectanalysis.period; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/period/PeriodHolderRule.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/period/PeriodHolderRule.java index b936136a474..cbd49802b2d 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodHolderRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/period/PeriodHolderRule.java @@ -17,7 +17,7 @@ * along with this program; 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.period; +package org.sonar.ce.task.projectanalysis.period; import javax.annotation.Nullable; import org.junit.rules.TestRule; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/period/PeriodTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/period/PeriodTest.java index b1518bb3868..878f83557d5 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/period/PeriodTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.period; +package org.sonar.ce.task.projectanalysis.period; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java index 307072f82c7..7be45fa877c 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java @@ -17,41 +17,41 @@ * along with this program; 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.qualitygate; +package org.sonar.ce.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.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.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.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.task.projectanalysis.measure.Measure.newMeasureBuilder; -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.metric.Metric.MetricType; -import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.BOOL; -import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.DATA; -import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.FLOAT; -import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.INT; -import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.LEVEL; -import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.PERCENT; -import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.RATING; -import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.STRING; -import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.WORK_DUR; -import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.values; -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; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.Level.ERROR; +import static org.sonar.ce.task.projectanalysis.measure.Measure.Level.OK; +import static org.sonar.ce.task.projectanalysis.metric.Metric.MetricType; +import static org.sonar.ce.task.projectanalysis.metric.Metric.MetricType.BOOL; +import static org.sonar.ce.task.projectanalysis.metric.Metric.MetricType.DATA; +import static org.sonar.ce.task.projectanalysis.metric.Metric.MetricType.FLOAT; +import static org.sonar.ce.task.projectanalysis.metric.Metric.MetricType.INT; +import static org.sonar.ce.task.projectanalysis.metric.Metric.MetricType.LEVEL; +import static org.sonar.ce.task.projectanalysis.metric.Metric.MetricType.PERCENT; +import static org.sonar.ce.task.projectanalysis.metric.Metric.MetricType.RATING; +import static org.sonar.ce.task.projectanalysis.metric.Metric.MetricType.STRING; +import static org.sonar.ce.task.projectanalysis.metric.Metric.MetricType.WORK_DUR; +import static org.sonar.ce.task.projectanalysis.metric.Metric.MetricType.values; +import static org.sonar.ce.task.projectanalysis.qualitygate.Condition.Operator.EQUALS; +import static org.sonar.ce.task.projectanalysis.qualitygate.Condition.Operator.GREATER_THAN; +import static org.sonar.ce.task.projectanalysis.qualitygate.Condition.Operator.LESS_THAN; +import static org.sonar.ce.task.projectanalysis.qualitygate.Condition.Operator.NOT_EQUALS; +import static org.sonar.ce.task.projectanalysis.qualitygate.EvaluationResultAssert.assertThat; public class ConditionEvaluatorTest { @Rule diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatusTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/ConditionStatusTest.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatusTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/ConditionStatusTest.java index d95b8c79f0d..e387c21a954 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionStatusTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.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.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; +import static org.sonar.ce.task.projectanalysis.qualitygate.ConditionStatus.EvaluationStatus.NO_VALUE; +import static org.sonar.ce.task.projectanalysis.qualitygate.ConditionStatus.EvaluationStatus.OK; +import static org.sonar.ce.task.projectanalysis.qualitygate.ConditionStatus.EvaluationStatus.values; @RunWith(DataProviderRunner.class) public class ConditionStatusTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/ConditionTest.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/ConditionTest.java index 9a7d4d9defe..d427ecb19b4 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.server.computation.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.Metric; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultAssert.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/EvaluationResultAssert.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultAssert.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/EvaluationResultAssert.java index db3213cf956..b252af171e7 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultAssert.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import java.util.Objects; import org.assertj.core.api.AbstractAssert; -import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.Measure; class EvaluationResultAssert extends AbstractAssert { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/EvaluationResultTest.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/EvaluationResultTest.java index 6b97d63003b..2a2f1b45f48 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import org.junit.Test; -import org.sonar.server.computation.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.Measure; import static org.assertj.core.api.Assertions.assertThat; @@ -43,6 +43,6 @@ public class EvaluationResultTest { @Test public void toString_is_defined() { assertThat(new EvaluationResult(Measure.Level.OK, "toto").toString()) - .isEqualTo("EvaluationResult{level=OK, value=toto}"); + .isEqualTo("EvaluationResult{level=OK, value=toto}"); } } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/EvaluationResultTextConverterTest.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/EvaluationResultTextConverterTest.java index a775f06dc8a..46811370c5c 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/EvaluationResultTextConverterTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import com.google.common.collect.ImmutableList; import com.tngtech.java.junit.dataprovider.DataProvider; @@ -32,18 +32,18 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.sonar.api.i18n.I18n; import org.sonar.api.utils.Durations; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricImpl; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolderRule; import org.sonar.core.timemachine.Periods; -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.PeriodHolderRule; 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.task.projectanalysis.measure.Measure.Level.ERROR; -import static org.sonar.server.computation.task.projectanalysis.measure.Measure.Level.WARN; +import static org.sonar.ce.task.projectanalysis.measure.Measure.Level.ERROR; +import static org.sonar.ce.task.projectanalysis.measure.Measure.Level.WARN; @RunWith(DataProviderRunner.class) public class EvaluationResultTextConverterTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolderRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/MutableQualityGateHolderRule.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolderRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/MutableQualityGateHolderRule.java index cd1c045d9d3..ac75b5d7fe4 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateHolderRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import java.util.Optional; import org.junit.rules.ExternalResource; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolderRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/MutableQualityGateStatusHolderRule.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolderRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/MutableQualityGateStatusHolderRule.java index 10e8ab08959..8a29ac4c72b 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/MutableQualityGateStatusHolderRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import java.util.Map; import org.junit.rules.ExternalResource; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateHolderImplTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateHolderImplTest.java index a53912856e3..5db1a513a59 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import org.junit.Test; import org.sonar.server.qualitygate.EvaluatedQualityGate; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateHolderRule.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateHolderRule.java index 10a0c320eb5..c38e694abbd 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateHolderRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import java.util.Optional; import javax.annotation.Nullable; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateServiceImplTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateServiceImplTest.java index 10b62b9f898..65e1be110e2 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import com.google.common.collect.ImmutableList; import java.util.Collections; @@ -27,14 +27,14 @@ import org.apache.commons.lang.RandomStringUtils; import org.junit.Before; import org.junit.Test; import org.sonar.api.measures.CoreMetrics; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricImpl; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.db.DbClient; 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.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.qualitygate.ShortLivingBranchQualityGate; import static org.assertj.core.api.Assertions.assertThat; @@ -43,7 +43,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.sonar.server.computation.task.projectanalysis.qualitygate.Condition.Operator.GREATER_THAN; +import static org.sonar.ce.task.projectanalysis.qualitygate.Condition.Operator.GREATER_THAN; public class QualityGateServiceImplTest { private static final long SOME_ID = 123; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateStatusHolderImplTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitygate/QualityGateStatusHolderImplTest.java index 7deef3a430c..fa3ecc30678 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateStatusHolderImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.qualitygate; +package org.sonar.ce.task.projectanalysis.qualitygate; import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitorTest.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitorTest.java index 261c257de2c..bc050d1d48d 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitorTest.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.task.projectanalysis.qualitymodel; +package org.sonar.ce.task.projectanalysis.qualitymodel; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -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.TreeRootHolderRule; -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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.VisitorsCrawler; +import org.sonar.ce.task.projectanalysis.issue.ComponentIssuesRepositoryRule; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import org.sonar.server.measure.DebtRatingGrid; import org.sonar.server.measure.Rating; @@ -50,14 +50,14 @@ 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.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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; import static org.sonar.server.measure.Rating.A; import static org.sonar.server.measure.Rating.C; import static org.sonar.server.measure.Rating.E; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitorTest.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitorTest.java index 85c0c128655..2d126d090cd 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitymodel/NewMaintainabilityMeasuresVisitorTest.java @@ -17,7 +17,7 @@ * along with this program; 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.qualitymodel; +package org.sonar.ce.task.projectanalysis.qualitymodel; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -31,18 +31,18 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.KeyValueFormat; -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.TreeRootHolderRule; -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.period.Period; -import org.sonar.server.computation.task.projectanalysis.period.PeriodHolderRule; -import org.sonar.server.computation.task.projectanalysis.scm.Changeset; -import org.sonar.server.computation.task.projectanalysis.scm.ScmInfoRepositoryRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.VisitorsCrawler; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolderRule; +import org.sonar.ce.task.projectanalysis.scm.Changeset; +import org.sonar.ce.task.projectanalysis.scm.ScmInfoRepositoryRule; import org.sonar.server.measure.DebtRatingGrid; import org.sonar.server.measure.Rating; @@ -59,12 +59,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.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; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureAssert.assertThat; import static org.sonar.server.measure.Rating.A; import static org.sonar.server.measure.Rating.D; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitorTest.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitorTest.java index 1346d176fcc..736590ef081 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitorTest.java @@ -17,7 +17,7 @@ * along with this program; 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.qualitymodel; +package org.sonar.ce.task.projectanalysis.qualitymodel; import java.util.Arrays; import java.util.Date; @@ -25,20 +25,20 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.rules.RuleType; import org.sonar.api.utils.Duration; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.VisitorsCrawler; +import org.sonar.ce.task.projectanalysis.issue.ComponentIssuesRepositoryRule; +import org.sonar.ce.task.projectanalysis.issue.FillComponentIssuesVisitorRule; +import org.sonar.ce.task.projectanalysis.measure.MeasureAssert; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolderRule; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.util.Uuids; -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.TreeRootHolderRule; -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.MeasureAssert; -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.PeriodHolderRule; import org.sonar.server.measure.Rating; import static org.assertj.core.api.Assertions.assertThat; @@ -55,12 +55,11 @@ 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.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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; import static org.sonar.server.measure.Rating.A; import static org.sonar.server.measure.Rating.B; import static org.sonar.server.measure.Rating.C; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingSettingsTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitymodel/RatingSettingsTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingSettingsTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitymodel/RatingSettingsTest.java index 2fb023fa235..563aa44105a 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/RatingSettingsTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.qualitymodel; +package org.sonar.ce.task.projectanalysis.qualitymodel; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitorTest.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitorTest.java index 722c37d8532..2515164754f 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitorTest.java @@ -17,7 +17,7 @@ * along with this program; 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.qualitymodel; +package org.sonar.ce.task.projectanalysis.qualitymodel; import java.util.Arrays; import java.util.Date; @@ -25,18 +25,18 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.rules.RuleType; import org.sonar.api.utils.Duration; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.VisitorsCrawler; +import org.sonar.ce.task.projectanalysis.issue.ComponentIssuesRepositoryRule; +import org.sonar.ce.task.projectanalysis.issue.FillComponentIssuesVisitorRule; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.util.Uuids; -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.TreeRootHolderRule; -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.measure.Rating; import static org.assertj.core.api.Assertions.assertThat; @@ -53,15 +53,14 @@ 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.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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; import static org.sonar.server.measure.Rating.A; import static org.sonar.server.measure.Rating.B; import static org.sonar.server.measure.Rating.C; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualityprofile/ActiveRulesHolderImplTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualityprofile/ActiveRulesHolderImplTest.java index e115241c826..b2d2b3844c2 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.qualityprofile; +package org.sonar.ce.task.projectanalysis.qualityprofile; import com.google.common.base.Optional; import java.util.Collections; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualityprofile/ActiveRulesHolderRule.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualityprofile/ActiveRulesHolderRule.java index 36e42f8b8de..d84a41ee8ca 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.qualityprofile; +package org.sonar.ce.task.projectanalysis.qualityprofile; import com.google.common.base.Optional; import java.util.HashMap; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/AlwaysActiveRulesHolderImpl.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualityprofile/AlwaysActiveRulesHolderImpl.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/AlwaysActiveRulesHolderImpl.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualityprofile/AlwaysActiveRulesHolderImpl.java index 088138a8c53..b3ca93668a4 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/AlwaysActiveRulesHolderImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualityprofile/AlwaysActiveRulesHolderImpl.java @@ -17,7 +17,7 @@ * along with this program; 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.qualityprofile; +package org.sonar.ce.task.projectanalysis.qualityprofile; import com.google.common.base.Optional; import org.sonar.api.rule.RuleKey; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ChangesetTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/ChangesetTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ChangesetTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/ChangesetTest.java index 997f9defd79..9137f911e25 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ChangesetTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.scm; +package org.sonar.ce.task.projectanalysis.scm; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfoTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/DbScmInfoTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfoTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/DbScmInfoTest.java index 91c71ceab4a..062716598e9 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfoTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/DbScmInfoTest.java @@ -17,7 +17,7 @@ * along with this program; 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.scm; +package org.sonar.ce.task.projectanalysis.scm; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfoTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/ReportScmInfoTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfoTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/ReportScmInfoTest.java index 783b440f995..647d69028c9 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfoTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.scm; +package org.sonar.ce.task.projectanalysis.scm; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoDbLoaderTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoDbLoaderTest.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoDbLoaderTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoDbLoaderTest.java index a231f5512d6..18b8500bf7d 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoDbLoaderTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoDbLoaderTest.java @@ -17,7 +17,7 @@ * along with this program; 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.scm; +package org.sonar.ce.task.projectanalysis.scm; import com.google.common.collect.ImmutableList; import java.util.Iterator; @@ -28,22 +28,22 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.api.utils.log.LogTester; +import org.sonar.ce.task.projectanalysis.analysis.Analysis; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.MergeBranchComponentUuids; import org.sonar.core.hash.SourceHashComputer; import org.sonar.db.DbTester; import org.sonar.db.protobuf.DbFileSources; import org.sonar.db.source.FileSourceDto; -import org.sonar.server.computation.task.projectanalysis.analysis.Analysis; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; -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.MergeBranchComponentUuids; 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.utils.log.LoggerLevel.TRACE; -import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; public class ScmInfoDbLoaderTest { static final int FILE_REF = 1; @@ -103,14 +103,14 @@ public class ScmInfoDbLoaderTest { assertThat(scmInfo.fileHash()).isEqualTo(hash); assertThat(logTester.logs(TRACE)).containsOnly("Reading SCM info from DB for file 'mergeFileUuid'"); } - + @Test public void return_empty_if_no_dto_available() { analysisMetadataHolder.setBaseAnalysis(baseProjectAnalysis); analysisMetadataHolder.setBranch(null); - + Optional scmInfo = underTest.getScmInfo(FILE); - + assertThat(logTester.logs(TRACE)).containsOnly("Reading SCM info from DB for file 'FILE_UUID'"); assertThat(scmInfo).isEmpty(); } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoImplTest.java similarity index 98% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoImplTest.java index 2f2264a95b1..44ebee2235a 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.scm; +package org.sonar.ce.task.projectanalysis.scm; import com.google.common.collect.ImmutableMap; import java.util.Collections; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java index b66f5b2281e..8947d020be0 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.scm; +package org.sonar.ce.task.projectanalysis.scm; import com.google.common.collect.ImmutableList; import com.tngtech.java.junit.dataprovider.DataProvider; @@ -34,20 +34,20 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.sonar.api.utils.log.LogTester; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component.Status; +import org.sonar.ce.task.projectanalysis.component.Component.Type; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.ViewsComponent; +import org.sonar.ce.task.projectanalysis.source.SourceHashRepository; +import org.sonar.ce.task.projectanalysis.source.SourceLinesDiff; import org.sonar.db.protobuf.DbFileSources.Line; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.Changesets; -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.Component.Status; -import org.sonar.server.computation.task.projectanalysis.component.Component.Type; -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.source.SourceHashRepository; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesDiff; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -56,7 +56,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import static org.sonar.api.utils.log.LoggerLevel.TRACE; -import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; @RunWith(DataProviderRunner.class) public class ScmInfoRepositoryImplTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoRepositoryRule.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoRepositoryRule.java index 613ad85f791..34be576d66e 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoRepositoryRule.java @@ -17,7 +17,7 @@ * along with this program; 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.scm; +package org.sonar.ce.task.projectanalysis.scm; import java.util.HashMap; import java.util.Map; @@ -25,7 +25,7 @@ import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.IntStream; import org.junit.rules.ExternalResource; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; import static com.google.common.base.Preconditions.checkNotNull; @@ -46,11 +46,11 @@ public class ScmInfoRepositoryRule extends ExternalResource implements ScmInfoRe } public ScmInfoRepositoryRule setScmInfo(int fileRef, Changeset... changesetList) { - Map changeset = IntStream.rangeClosed(1, changesetList.length).boxed().collect(Collectors.toMap(x -> x, x -> changesetList[x-1])); + Map changeset = IntStream.rangeClosed(1, changesetList.length).boxed().collect(Collectors.toMap(x -> x, x -> changesetList[x - 1])); scmInfoByFileRef.put(fileRef, new ScmInfoImpl(changeset)); return this; } - + public ScmInfoRepositoryRule setScmInfo(int fileRef, Map changesets) { scmInfoByFileRef.put(fileRef, new ScmInfoImpl(changesets)); return this; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceDataTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/ComputeFileSourceDataTest.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceDataTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/ComputeFileSourceDataTest.java index c66d1606c89..3bdaf738b34 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceDataTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/ComputeFileSourceDataTest.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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import com.google.common.collect.Lists; import org.junit.Test; +import org.sonar.ce.task.projectanalysis.source.SourceLinesHashRepositoryImpl.LineHashesComputer; +import org.sonar.ce.task.projectanalysis.source.linereader.LineReader; import org.sonar.db.protobuf.DbFileSources; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesHashRepositoryImpl.LineHashesComputer; -import org.sonar.server.computation.task.projectanalysis.source.linereader.LineReader; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/DbLineHashVersionTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/DbLineHashVersionTest.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/DbLineHashVersionTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/DbLineHashVersionTest.java index 0d9256be33d..b36ec88f1ad 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/DbLineHashVersionTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/DbLineHashVersionTest.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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import org.junit.Rule; import org.junit.Test; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentTesting; import org.sonar.db.source.LineHashVersion; -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-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/LastCommitVisitorTest.java similarity index 80% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/LastCommitVisitorTest.java index 0e74f3bec50..f1049cc9bc6 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/LastCommitVisitorTest.java @@ -17,36 +17,36 @@ * along with this program; 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.source; +package org.sonar.ce.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.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.TreeRootHolderRule; -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 org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.ViewsComponent; +import org.sonar.ce.task.projectanalysis.component.VisitorsCrawler; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.scm.Changeset; +import org.sonar.ce.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.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; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; public class LastCommitVisitorTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverterTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/RangeOffsetConverterTest.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverterTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/RangeOffsetConverterTest.java index 88c19784e19..1c41535eb07 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/RangeOffsetConverterTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/RangeOffsetConverterTest.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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.sonar.ce.task.projectanalysis.source.linereader.RangeOffsetConverter; +import org.sonar.ce.task.projectanalysis.source.linereader.RangeOffsetConverter.RangeOffsetConverterException; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.task.projectanalysis.source.linereader.RangeOffsetConverter; -import org.sonar.server.computation.task.projectanalysis.source.linereader.RangeOffsetConverter.RangeOffsetConverterException; import static org.assertj.core.api.Assertions.assertThat; @@ -51,42 +51,42 @@ public class RangeOffsetConverterTest { public void return_range() { assertThat(underTest.offsetToString(createTextRange(LINE_1, LINE_1, OFFSET_2, OFFSET_3), LINE_1, DEFAULT_LINE_LENGTH)) - .isEqualTo(OFFSET_2 + "," + OFFSET_3); + .isEqualTo(OFFSET_2 + "," + OFFSET_3); } @Test public void return_range_not_finishing_in_current_line() { assertThat(underTest.offsetToString(createTextRange(LINE_1, LINE_3, OFFSET_2, OFFSET_3), LINE_1, DEFAULT_LINE_LENGTH)) - .isEqualTo(OFFSET_2 + "," + DEFAULT_LINE_LENGTH); + .isEqualTo(OFFSET_2 + "," + DEFAULT_LINE_LENGTH); } @Test public void return_range_that_began_in_previous_line_and_finish_in_current_line() { assertThat(underTest.offsetToString(createTextRange(LINE_1, LINE_3, OFFSET_2, OFFSET_3), LINE_3, DEFAULT_LINE_LENGTH)) - .isEqualTo(OFFSET_0 + "," + OFFSET_3); + .isEqualTo(OFFSET_0 + "," + OFFSET_3); } @Test public void return_range_that_began_in_previous_line_and_not_finishing_in_current_line() { assertThat(underTest.offsetToString(createTextRange(LINE_1, LINE_1, OFFSET_2, OFFSET_3), LINE_2, DEFAULT_LINE_LENGTH)) - .isEqualTo(OFFSET_0 + "," + DEFAULT_LINE_LENGTH); + .isEqualTo(OFFSET_0 + "," + DEFAULT_LINE_LENGTH); } @Test public void return_empty_string_when_offset_is_empty() { assertThat(underTest.offsetToString(createTextRange(LINE_1, LINE_1, OFFSET_0, OFFSET_0), LINE_1, DEFAULT_LINE_LENGTH)) - .isEmpty(); + .isEmpty(); } @Test public void return_whole_line_offset_when_range_begin_at_first_character_and_ends_at_first_character_of_next_line() { assertThat(underTest.offsetToString(createTextRange(LINE_1, LINE_2, OFFSET_0, OFFSET_0), LINE_1, DEFAULT_LINE_LENGTH)) - .isEqualTo(OFFSET_0 + "," + DEFAULT_LINE_LENGTH); + .isEqualTo(OFFSET_0 + "," + DEFAULT_LINE_LENGTH); } @Test diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ReportIteratorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/ReportIteratorTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ReportIteratorTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/ReportIteratorTest.java index 73c6fb6516d..a24b410c371 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ReportIteratorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import java.io.File; import java.util.NoSuchElementException; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SignificantCodeRepositoryTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SignificantCodeRepositoryTest.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SignificantCodeRepositoryTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SignificantCodeRepositoryTest.java index baf59f7acb8..53f63e13203 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SignificantCodeRepositoryTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SignificantCodeRepositoryTest.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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import java.util.ArrayList; import java.util.List; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; import org.sonar.core.hash.LineRange; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.LineSgnificantCode; -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.FileAttributes; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; public class SignificantCodeRepositoryTest { private static final String FILE_UUID = "FILE_UUID"; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceHashRepositoryImplTest.java similarity index 77% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceHashRepositoryImplTest.java index 5afea9744c5..0a53cc7d075 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceHashRepositoryImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -31,11 +31,11 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.ViewsComponent; import org.sonar.core.hash.SourceHashComputer; import org.sonar.core.util.CloseableIterator; -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; @@ -80,34 +80,34 @@ public class SourceHashRepositoryImplTest { @DataProvider public static Object[][] componentsOfAllTypesButFile() { return FluentIterable.from(Arrays.asList(Component.Type.values())) - .filter(new Predicate() { - @Override - public boolean apply(@Nullable Component.Type input) { - return input != Component.Type.FILE; + .filter(new Predicate() { + @Override + public boolean apply(@Nullable Component.Type input) { + return input != Component.Type.FILE; + } + }) + .transform(new Function() { + @Nullable + @Override + public Component apply(Component.Type input) { + if (input.isReportType()) { + return ReportComponent.builder(input, input.hashCode()) + .setKey(input.name() + "_key") + .build(); + } else if (input.isViewsType()) { + return ViewsComponent.builder(input, input.name() + "_key") + .build(); + } else { + throw new IllegalArgumentException("Unsupported type " + input); } - }) - .transform(new Function() { - @Nullable - @Override - public Component apply(Component.Type input) { - if (input.isReportType()) { - return ReportComponent.builder(input, input.hashCode()) - .setKey(input.name() + "_key") - .build(); - } else if (input.isViewsType()) { - return ViewsComponent.builder(input, input.name() + "_key") - .build(); - } else { - throw new IllegalArgumentException("Unsupported type " + input); - } - } - }).transform(new Function() { - @Nullable - @Override - public Component[] apply(@Nullable Component input) { - return new Component[] { input }; - } - }).toArray(Component[].class); + } + }).transform(new Function() { + @Nullable + @Override + public Component[] apply(@Nullable Component input) { + return new Component[] {input}; + } + }).toArray(Component[].class); } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesDiffFinderTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesDiffFinderTest.java similarity index 99% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesDiffFinderTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesDiffFinderTest.java index 7fe94520fa5..8f8e11bed47 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesDiffFinderTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesDiffFinderTest.java @@ -17,7 +17,7 @@ * along with this program; 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.source; +package org.sonar.ce.task.projectanalysis.source; import java.util.ArrayList; import java.util.List; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesDiffImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesDiffImplTest.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesDiffImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesDiffImplTest.java index 364b76756ba..38ece6359e0 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesDiffImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesDiffImplTest.java @@ -17,24 +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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import java.util.Arrays; import javax.annotation.Nullable; import org.junit.Before; import org.junit.Test; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.component.ComponentDao; import org.sonar.db.source.FileSourceDao; -import org.sonar.server.computation.task.projectanalysis.component.Component; import static java.lang.String.valueOf; 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.task.projectanalysis.component.Component.Type.FILE; -import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; public class SourceLinesDiffImplTest { @@ -50,7 +50,7 @@ public class SourceLinesDiffImplTest { private static final String FILE_KEY = valueOf(FILE_REF); private static final String[] CONTENT = { - "package org.sonar.server.computation.task.projectanalysis.source_diff;", + "package org.sonar.ce.task.projectanalysis.source_diff;", "", "public class Foo {", " public String bar() {", diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesHashCacheTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashCacheTest.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesHashCacheTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashCacheTest.java index a738d8e84e0..f467fcb9654 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesHashCacheTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashCacheTest.java @@ -17,7 +17,7 @@ * along with this program; 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.source; +package org.sonar.ce.task.projectanalysis.source; import java.util.Collections; import java.util.List; @@ -27,13 +27,13 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.utils.internal.JUnitTempFolder; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; public class SourceLinesHashCacheTest { private static final String FILE_UUID = "FILE_UUID"; @@ -87,7 +87,7 @@ public class SourceLinesHashCacheTest { } private static Component createComponent(int ref) { - return builder(Component.Type.FILE, ref) + return ReportComponent.builder(Component.Type.FILE, ref) .setKey(FILE_KEY) .setUuid(FILE_UUID) .build(); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesHashImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashImplTest.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesHashImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashImplTest.java index d541c8702d1..f371e0eb4d1 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesHashImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashImplTest.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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component; import static org.mockito.Mockito.mock; -import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; public class SourceLinesHashImplTest { private static final String FILE_UUID = "FILE_UUID"; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesHashRepositoryImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashRepositoryImplTest.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesHashRepositoryImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashRepositoryImplTest.java index 0b607c689db..1529f34dd4b 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesHashRepositoryImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashRepositoryImplTest.java @@ -17,7 +17,7 @@ * along with this program; 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.source; +package org.sonar.ce.task.projectanalysis.source; import com.google.common.collect.Lists; import java.util.List; @@ -26,15 +26,15 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.internal.JUnitTempFolder; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.Component.Type; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.source.SourceLinesHashRepositoryImpl.CachedLineHashesComputer; +import org.sonar.ce.task.projectanalysis.source.SourceLinesHashRepositoryImpl.LineHashesComputer; +import org.sonar.ce.task.projectanalysis.source.SourceLinesHashRepositoryImpl.SignificantCodeLineHashesComputer; import org.sonar.core.hash.LineRange; import org.sonar.core.hash.SourceLineHashesComputer; import org.sonar.db.source.LineHashVersion; -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.component.ReportComponent; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesHashRepositoryImpl.CachedLineHashesComputer; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesHashRepositoryImpl.LineHashesComputer; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesHashRepositoryImpl.SignificantCodeLineHashesComputer; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepositoryImplTest.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImplTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepositoryImplTest.java index 1dacd1fe8de..209273b593d 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; import org.sonar.core.util.CloseableIterator; -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.FileAttributes; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; public class SourceLinesRepositoryImplTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryRule.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepositoryRule.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryRule.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepositoryRule.java index b8730fe161c..542df710dcf 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryRule.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepositoryRule.java @@ -17,19 +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.task.projectanalysis.source; +package org.sonar.ce.task.projectanalysis.source; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import java.util.Arrays; import java.util.Collection; import org.junit.rules.ExternalResource; +import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.util.CloseableIterator; -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.task.projectanalysis.component.Component.Type.FILE; public class SourceLinesRepositoryRule extends ExternalResource implements SourceLinesRepository { @@ -43,7 +42,7 @@ public class SourceLinesRepositoryRule extends ExternalResource implements Sourc @Override public CloseableIterator readLines(Component component) { checkNotNull(component, "Component should not be bull"); - if (!component.getType().equals(FILE)) { + if (!component.getType().equals(Component.Type.FILE)) { throw new IllegalArgumentException(String.format("Component '%s' is not a file", component)); } Collection componentLines = lines.get(component.getReportAttributes().getRef()); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/linereader/CoverageLineReaderTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/linereader/CoverageLineReaderTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/linereader/CoverageLineReaderTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/linereader/CoverageLineReaderTest.java index 54b9f15a073..a126a0b9b1d 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/linereader/CoverageLineReaderTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/linereader/CoverageLineReaderTest.java @@ -17,13 +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.task.projectanalysis.source.linereader; +package org.sonar.ce.task.projectanalysis.source.linereader; import java.util.Collections; import org.junit.Test; import org.sonar.db.protobuf.DbFileSources; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.task.projectanalysis.source.linereader.CoverageLineReader; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/linereader/DuplicationLineReaderTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/linereader/DuplicationLineReaderTest.java similarity index 77% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/linereader/DuplicationLineReaderTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/linereader/DuplicationLineReaderTest.java index 8fb5c00537f..5d538a7ac32 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/linereader/DuplicationLineReaderTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/linereader/DuplicationLineReaderTest.java @@ -17,22 +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.task.projectanalysis.source.linereader; +package org.sonar.ce.task.projectanalysis.source.linereader; import com.google.common.collect.ImmutableSet; import java.util.Arrays; import java.util.Collections; import org.junit.Test; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.duplication.CrossProjectDuplicate; +import org.sonar.ce.task.projectanalysis.duplication.Duplicate; +import org.sonar.ce.task.projectanalysis.duplication.Duplication; +import org.sonar.ce.task.projectanalysis.duplication.InProjectDuplicate; +import org.sonar.ce.task.projectanalysis.duplication.InnerDuplicate; +import org.sonar.ce.task.projectanalysis.duplication.TextBlock; import org.sonar.db.protobuf.DbFileSources; -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 org.sonar.server.computation.task.projectanalysis.source.linereader.DuplicationLineReader; import static org.assertj.core.api.Assertions.assertThat; @@ -71,9 +70,9 @@ public class DuplicationLineReaderTest { @Test public void read_duplication_with_duplicates_on_other_file() { DuplicationLineReader reader = duplicationLineReader( - duplication( - 1, 2, - new InProjectDuplicate(fileComponent(1).build(), new TextBlock(3, 4)))); + duplication( + 1, 2, + new InProjectDuplicate(fileComponent(1).build(), new TextBlock(3, 4)))); reader.read(line1); reader.read(line2); @@ -89,9 +88,9 @@ public class DuplicationLineReaderTest { @Test public void read_duplication_with_duplicates_on_other_file_from_other_project() { DuplicationLineReader reader = duplicationLineReader( - duplication( - 1, 2, - new CrossProjectDuplicate("other-component-key-from-another-project", new TextBlock(3, 4)))); + duplication( + 1, 2, + new CrossProjectDuplicate("other-component-key-from-another-project", new TextBlock(3, 4)))); reader.read(line1); reader.read(line2); @@ -107,13 +106,12 @@ public class DuplicationLineReaderTest { @Test public void read_many_duplications() { DuplicationLineReader reader = duplicationLineReader( - duplication( - 1, 1, - innerDuplicate(2, 2)), - duplication( - 1, 2, - innerDuplicate(3, 4)) - ); + duplication( + 1, 1, + innerDuplicate(2, 2)), + duplication( + 1, 2, + innerDuplicate(3, 4))); reader.read(line1); reader.read(line2); @@ -129,13 +127,12 @@ public class DuplicationLineReaderTest { @Test public void should_be_sorted_by_line_block() { DuplicationLineReader reader = duplicationLineReader( - duplication( - 2, 2, - innerDuplicate(4, 4)), - duplication( - 1, 1, - innerDuplicate(3, 3)) - ); + duplication( + 2, 2, + innerDuplicate(4, 4)), + duplication( + 1, 1, + innerDuplicate(3, 3))); reader.read(line1); reader.read(line2); @@ -151,14 +148,12 @@ public class DuplicationLineReaderTest { @Test public void should_be_sorted_by_line_length() { DuplicationLineReader reader = duplicationLineReader( - duplication( - 1, 2, - innerDuplicate(3, 4)), - duplication( - 1, 1, - innerDuplicate(4, 4) - ) - ); + duplication( + 1, 2, + innerDuplicate(3, 4)), + duplication( + 1, 1, + innerDuplicate(4, 4))); reader.read(line1); reader.read(line2); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/linereader/HighlightingLineReaderTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/linereader/HighlightingLineReaderTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/linereader/HighlightingLineReaderTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/linereader/HighlightingLineReaderTest.java index 99f9778fc70..85d4881d457 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/linereader/HighlightingLineReaderTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/linereader/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.task.projectanalysis.source.linereader; +package org.sonar.ce.task.projectanalysis.source.linereader; import java.util.ArrayList; import java.util.Collections; @@ -27,14 +27,12 @@ import java.util.Random; import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.log.LogTester; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.source.linereader.RangeOffsetConverter.RangeOffsetConverterException; 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.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.source.linereader.HighlightingLineReader; -import org.sonar.server.computation.task.projectanalysis.source.linereader.RangeOffsetConverter; -import org.sonar.server.computation.task.projectanalysis.source.linereader.RangeOffsetConverter.RangeOffsetConverterException; import static com.google.common.collect.ImmutableMap.of; import static org.assertj.core.api.Assertions.assertThat; @@ -42,6 +40,7 @@ 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.ce.task.projectanalysis.component.ReportComponent.builder; import static org.sonar.db.protobuf.DbFileSources.Data.newBuilder; import static org.sonar.scanner.protocol.output.ScannerReport.SyntaxHighlightingRule.HighlightingType.ANNOTATION; import static org.sonar.scanner.protocol.output.ScannerReport.SyntaxHighlightingRule.HighlightingType.COMMENT; @@ -49,7 +48,6 @@ 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.task.projectanalysis.component.ReportComponent.builder; public class HighlightingLineReaderTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/linereader/ScmLineReaderTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/linereader/ScmLineReaderTest.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/linereader/ScmLineReaderTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/linereader/ScmLineReaderTest.java index ce3eea15611..548f061abbc 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/linereader/ScmLineReaderTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/linereader/ScmLineReaderTest.java @@ -17,17 +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.task.projectanalysis.source.linereader; +package org.sonar.ce.task.projectanalysis.source.linereader; import com.google.common.collect.ImmutableMap; import java.util.Collections; import java.util.Map; import org.junit.Test; +import org.sonar.ce.task.projectanalysis.scm.Changeset; +import org.sonar.ce.task.projectanalysis.scm.ScmInfo; +import org.sonar.ce.task.projectanalysis.scm.ScmInfoImpl; import org.sonar.db.protobuf.DbFileSources; -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 org.sonar.server.computation.task.projectanalysis.source.linereader.ScmLineReader; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/linereader/SymbolsLineReaderTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/linereader/SymbolsLineReaderTest.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/linereader/SymbolsLineReaderTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/linereader/SymbolsLineReaderTest.java index ade3730e62e..d715dd001b5 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/source/linereader/SymbolsLineReaderTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/linereader/SymbolsLineReaderTest.java @@ -17,25 +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.task.projectanalysis.source.linereader; +package org.sonar.ce.task.projectanalysis.source.linereader; import java.util.Arrays; import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.log.LogTester; +import org.sonar.ce.task.projectanalysis.component.Component; 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.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.source.linereader.RangeOffsetConverter; -import org.sonar.server.computation.task.projectanalysis.source.linereader.SymbolsLineReader; 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.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; public class SymbolsLineReaderTest { @@ -83,8 +81,7 @@ public class SymbolsLineReaderTest { public void read_symbols() { SymbolsLineReader symbolsLineReader = newReader(newSymbol( newSingleLineTextRangeWithExpectedLabel(LINE_1, OFFSET_2, OFFSET_4, RANGE_LABEL_1), - newSingleLineTextRangeWithExpectedLabel(LINE_3, OFFSET_1, OFFSET_3, RANGE_LABEL_2) - )); + newSingleLineTextRangeWithExpectedLabel(LINE_3, OFFSET_1, OFFSET_3, RANGE_LABEL_2))); symbolsLineReader.read(line1); symbolsLineReader.read(line2); @@ -99,8 +96,7 @@ public class SymbolsLineReaderTest { public void read_symbols_with_reference_on_same_line() { SymbolsLineReader symbolsLineReader = newReader(newSymbol( newSingleLineTextRangeWithExpectedLabel(LINE_1, OFFSET_0, OFFSET_1, RANGE_LABEL_1), - newSingleLineTextRangeWithExpectedLabel(LINE_1, OFFSET_2, OFFSET_3, RANGE_LABEL_2) - )); + newSingleLineTextRangeWithExpectedLabel(LINE_1, OFFSET_2, OFFSET_3, RANGE_LABEL_2))); symbolsLineReader.read(line1); @@ -112,8 +108,7 @@ public class SymbolsLineReaderTest { SymbolsLineReader symbolsLineReader = newReader(newSymbol( newSingleLineTextRangeWithExpectedLabel(LINE_1, OFFSET_2, OFFSET_4, RANGE_LABEL_1), newSingleLineTextRangeWithExpectedLabel(LINE_3, OFFSET_1, OFFSET_3, RANGE_LABEL_2), - newSingleLineTextRangeWithExpectedLabel(LINE_2, OFFSET_0, OFFSET_2, RANGE_LABEL_3) - )); + newSingleLineTextRangeWithExpectedLabel(LINE_2, OFFSET_0, OFFSET_2, RANGE_LABEL_3))); symbolsLineReader.read(line1); symbolsLineReader.read(line2); @@ -129,8 +124,7 @@ public class SymbolsLineReaderTest { SymbolsLineReader symbolsLineReader = newReader(newSymbol( newSingleLineTextRangeWithExpectedLabel(LINE_1, OFFSET_2, OFFSET_3, RANGE_LABEL_1), newSingleLineTextRangeWithExpectedLabel(LINE_2, OFFSET_0, OFFSET_1, RANGE_LABEL_2), - newSingleLineTextRangeWithExpectedLabel(LINE_2, OFFSET_2, OFFSET_3, RANGE_LABEL_3) - )); + newSingleLineTextRangeWithExpectedLabel(LINE_2, OFFSET_2, OFFSET_3, RANGE_LABEL_3))); symbolsLineReader.read(line1); symbolsLineReader.read(line2); @@ -143,8 +137,7 @@ public class SymbolsLineReaderTest { public void read_symbols_when_reference_line_is_before_declaration_line() { SymbolsLineReader symbolsLineReader = newReader(newSymbol( newSingleLineTextRangeWithExpectedLabel(LINE_2, OFFSET_3, OFFSET_4, RANGE_LABEL_1), - newSingleLineTextRangeWithExpectedLabel(LINE_1, OFFSET_1, OFFSET_2, RANGE_LABEL_2) - )); + newSingleLineTextRangeWithExpectedLabel(LINE_1, OFFSET_1, OFFSET_2, RANGE_LABEL_2))); symbolsLineReader.read(line1); symbolsLineReader.read(line2); @@ -161,8 +154,7 @@ public class SymbolsLineReaderTest { newSingleLineTextRangeWithExpectedLabel(LINE_3, OFFSET_2, OFFSET_3, RANGE_LABEL_2)), newSymbol( newSingleLineTextRangeWithExpectedLabel(LINE_1, OFFSET_3, OFFSET_4, RANGE_LABEL_3), - newSingleLineTextRangeWithExpectedLabel(LINE_3, OFFSET_0, OFFSET_1, RANGE_LABEL_4) - )); + newSingleLineTextRangeWithExpectedLabel(LINE_3, OFFSET_0, OFFSET_1, RANGE_LABEL_4))); symbolsLineReader.read(line1); symbolsLineReader.read(line2); @@ -182,8 +174,7 @@ public class SymbolsLineReaderTest { newSingleLineTextRangeWithExpectedLabel(LINE_3, OFFSET_2, OFFSET_3, RANGE_LABEL_1)), newSymbol( newSingleLineTextRangeWithExpectedLabel(LINE_1, OFFSET_0, OFFSET_1, RANGE_LABEL_2), - newSingleLineTextRangeWithExpectedLabel(LINE_3, OFFSET_0, OFFSET_1, RANGE_LABEL_2) - )); + newSingleLineTextRangeWithExpectedLabel(LINE_3, OFFSET_0, OFFSET_1, RANGE_LABEL_2))); symbolsLineReader.read(line1); symbolsLineReader.read(line2); @@ -202,8 +193,7 @@ public class SymbolsLineReaderTest { newSingleLineTextRangeWithExpectedLabel(LINE_3, OFFSET_2, OFFSET_3, RANGE_LABEL_2)), newSymbol( newSingleLineTextRangeWithExpectedLabel(LINE_1, OFFSET_0, OFFSET_1, RANGE_LABEL_1), - newSingleLineTextRangeWithExpectedLabel(LINE_3, OFFSET_0, OFFSET_1, RANGE_LABEL_1) - )); + newSingleLineTextRangeWithExpectedLabel(LINE_3, OFFSET_0, OFFSET_1, RANGE_LABEL_1))); symbolsLineReader.read(line1); symbolsLineReader.read(line2); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BaseStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/BaseStepTest.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BaseStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/BaseStepTest.java index 5f7424d28ce..69df9220bd3 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BaseStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/BaseStepTest.java @@ -17,7 +17,7 @@ * along with this program; 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.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Test; import org.sonar.server.computation.task.step.ComputationStep; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/BuildComponentTreeStepTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/BuildComponentTreeStepTest.java index 0c7e75ae999..49cdaf24a2b 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; @@ -29,6 +29,12 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.DefaultBranchImpl; +import org.sonar.ce.task.projectanalysis.component.MutableTreeRootHolderRule; import org.sonar.db.DbClient; import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; @@ -37,13 +43,7 @@ import org.sonar.db.organization.OrganizationDto; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType; import org.sonar.scanner.protocol.output.ScannerReport.Component.FileStatus; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; -import org.sonar.server.computation.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; import org.sonar.server.project.Project; -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.DefaultBranchImpl; -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-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java similarity index 84% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java index 48a069353ed..49c57cdd570 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.collect.ImmutableMap; import java.util.Arrays; @@ -26,13 +26,13 @@ import java.util.List; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -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.FileAttributes; -import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; -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.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import org.sonar.server.qualityprofile.QPMeasureData; import org.sonar.server.qualityprofile.QualityProfile; @@ -41,10 +41,10 @@ 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.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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; public class ComputeQProfileMeasureStepTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/CustomMeasuresCopyStepTest.java similarity index 83% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/CustomMeasuresCopyStepTest.java index 7a1f6e3c154..b742dfd6d44 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/CustomMeasuresCopyStepTest.java @@ -17,40 +17,40 @@ * along with this program; 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.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.ViewsComponent; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricImpl; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; 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.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.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; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; +import static org.sonar.ce.task.projectanalysis.step.CustomMeasuresCopyStep.dtoToMeasure; public class CustomMeasuresCopyStepTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/DbMigrationsStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/DbMigrationsStepTest.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/DbMigrationsStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/DbMigrationsStepTest.java index 4808484e5a8..b2dc9150130 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/DbMigrationsStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/DbMigrationsStepTest.java @@ -17,7 +17,7 @@ * along with this program; 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.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.collect.ImmutableList; import java.sql.SQLException; @@ -27,8 +27,8 @@ import java.util.stream.IntStream; import org.junit.Test; import org.mockito.InOrder; import org.mockito.Mockito; -import org.sonar.server.computation.task.projectanalysis.dbmigration.ProjectAnalysisDataChange; -import org.sonar.server.computation.task.projectanalysis.dbmigration.ProjectAnalysisDataChanges; +import org.sonar.ce.task.projectanalysis.dbmigration.ProjectAnalysisDataChange; +import org.sonar.ce.task.projectanalysis.dbmigration.ProjectAnalysisDataChanges; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -80,8 +80,7 @@ public class DbMigrationsStepTest { ProjectAnalysisDataChange okMock4 = mock(ProjectAnalysisDataChange.class); InOrder inOrder = Mockito.inOrder(okMock1, okMock2, failingMock1, okMock3, failingMock2, okMock4); when(projectAnalysisDataChanges.getDataChanges()).thenReturn(ImmutableList.of( - okMock1, okMock2, failingMock1, okMock3, failingMock2, okMock4 - )); + okMock1, okMock2, failingMock1, okMock3, failingMock2, okMock4)); try { underTest.execute(); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/DuplicationDataMeasuresStepTest.java similarity index 80% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/DuplicationDataMeasuresStepTest.java index 63e2001a014..82bd1d8e0e5 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationDataMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/DuplicationDataMeasuresStepTest.java @@ -17,24 +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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; -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.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.duplication.DuplicationRepositoryRule; +import org.sonar.ce.task.projectanalysis.duplication.TextBlock; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.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.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.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; public class DuplicationDataMeasuresStepTest extends BaseStepTest { @@ -50,13 +50,13 @@ public class DuplicationDataMeasuresStepTest extends BaseStepTest { @Rule public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule() .setRoot( - builder(PROJECT, ROOT_REF).setKey(PROJECT_KEY) - .addChildren( - builder(FILE, FILE_1_REF).setKey(FILE_1_KEY) - .build(), - builder(FILE, FILE_2_REF).setKey(FILE_2_KEY) - .build()) - .build()); + builder(PROJECT, ROOT_REF).setKey(PROJECT_KEY) + .addChildren( + builder(FILE, FILE_1_REF).setKey(FILE_1_KEY) + .build(), + builder(FILE, FILE_2_REF).setKey(FILE_2_KEY) + .build()) + .build()); @Rule public DuplicationRepositoryRule duplicationRepository = DuplicationRepositoryRule.create(treeRootHolder); @@ -91,8 +91,7 @@ public class DuplicationDataMeasuresStepTest extends BaseStepTest { assertThat(measureRepository.getAddedRawMeasure(FILE_1_REF, DUPLICATIONS_DATA_KEY)).isPresent(); assertThat(measureRepository.getAddedRawMeasure(FILE_1_REF, DUPLICATIONS_DATA_KEY).get().getData()).isEqualTo( - "" - ); + ""); assertThat(measureRepository.getAddedRawMeasure(FILE_2_REF, DUPLICATIONS_DATA_KEY)).isAbsent(); } @@ -104,8 +103,7 @@ public class DuplicationDataMeasuresStepTest extends BaseStepTest { assertThat(measureRepository.getAddedRawMeasure(FILE_1_REF, DUPLICATIONS_DATA_KEY)).isPresent(); assertThat(measureRepository.getAddedRawMeasure(FILE_1_REF, DUPLICATIONS_DATA_KEY).get().getData()).isEqualTo( - "" - ); + ""); assertThat(measureRepository.getAddedRawMeasure(FILE_2_REF, DUPLICATIONS_DATA_KEY)).isAbsent(); } @@ -118,8 +116,7 @@ public class DuplicationDataMeasuresStepTest extends BaseStepTest { assertThat(measureRepository.getAddedRawMeasure(FILE_1_REF, DUPLICATIONS_DATA_KEY)).isPresent(); assertThat(measureRepository.getAddedRawMeasure(FILE_1_REF, DUPLICATIONS_DATA_KEY).get().getData()).isEqualTo( - "" - ); + ""); assertThat(measureRepository.getAddedRawMeasure(FILE_2_REF, DUPLICATIONS_DATA_KEY)).isAbsent(); } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/DuplicationMeasuresStepTest.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/DuplicationMeasuresStepTest.java index 0864b73bb5c..c1fe2a4f7f5 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/DuplicationMeasuresStepTest.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Test; -import org.sonar.server.computation.task.projectanalysis.duplication.DuplicationMeasures; +import org.sonar.ce.task.projectanalysis.duplication.DuplicationMeasures; import org.sonar.server.computation.task.step.ComputationStep; import static org.mockito.Mockito.mock; @@ -30,7 +30,7 @@ public class DuplicationMeasuresStepTest extends BaseStepTest { private DuplicationMeasures defaultDuplicationMeasures = mock(DuplicationMeasures.class); private DuplicationMeasuresStep underTest = new DuplicationMeasuresStep(defaultDuplicationMeasures); - + @Test public void full_analysis_mode() { underTest.execute(); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/EnableAnalysisStepTest.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/EnableAnalysisStepTest.java index 4431775bd0a..9616f98edc8 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/EnableAnalysisStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/EnableAnalysisStepTest.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.Optional; import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; import org.sonar.db.DbTester; 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.db.organization.OrganizationDto; -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.task.projectanalysis.component.Component.Type.PROJECT; public class EnableAnalysisStepTest { - private static final ReportComponent REPORT_PROJECT = ReportComponent.builder(PROJECT, 1).build(); + private static final ReportComponent REPORT_PROJECT = ReportComponent.builder(Component.Type.PROJECT, 1).build(); private static final String PREVIOUS_ANALYSIS_UUID = "ANALYSIS_1"; private static final String CURRENT_ANALYSIS_UUID = "ANALYSIS_2"; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ExecuteVisitorsStepTest.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ExecuteVisitorsStepTest.java index 3ac16b37229..f72a8260b31 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ExecuteVisitorsStepTest.java @@ -17,7 +17,7 @@ * along with this program; 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.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.List; import org.junit.Before; @@ -25,29 +25,29 @@ 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.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ComponentVisitor; +import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; +import org.sonar.ce.task.projectanalysis.component.PathAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.TypeAwareVisitorAdapter; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricImpl; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import org.sonar.server.computation.task.ChangeLogLevel; -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.TreeRootHolderRule; -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 java.util.Arrays.asList; import static java.util.Collections.singletonList; 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.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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; public class ExecuteVisitorsStepTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStepTest.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStepTest.java index 30488809ea2..6c08d9cb6a7 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.io.File; import java.io.IOException; @@ -33,10 +33,10 @@ import org.sonar.api.utils.internal.JUnitTempFolder; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; import org.sonar.ce.queue.CeTask; +import org.sonar.ce.task.projectanalysis.batch.BatchReportDirectoryHolderImpl; +import org.sonar.ce.task.projectanalysis.batch.MutableBatchReportDirectoryHolder; import org.sonar.db.DbTester; import org.sonar.db.ce.CeTaskTypes; -import org.sonar.server.computation.task.projectanalysis.batch.BatchReportDirectoryHolderImpl; -import org.sonar.server.computation.task.projectanalysis.batch.MutableBatchReportDirectoryHolder; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/IndexAnalysisStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/IndexAnalysisStepTest.java similarity index 77% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/IndexAnalysisStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/IndexAnalysisStepTest.java index c969d3afc0c..419d6bb049e 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/IndexAnalysisStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/IndexAnalysisStepTest.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; -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.TreeRootHolderRule; -import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.ViewsComponent; import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.es.ProjectIndexer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -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.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; public class IndexAnalysisStepTest extends BaseStepTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java index 9609f4f1806..1e6ad5596d4 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.ArrayList; import java.util.Collections; @@ -30,6 +30,15 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.ArgumentCaptor; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.Analysis; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.duplication.CrossProjectDuplicationStatusHolder; +import org.sonar.ce.task.projectanalysis.duplication.IntegrateCrossProjectDuplications; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.DbTester; @@ -41,15 +50,6 @@ 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.task.projectanalysis.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.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.TreeRootHolderRule; -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 static java.util.Arrays.asList; @@ -59,8 +59,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.task.projectanalysis.component.Component.Type.FILE; -import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; public class LoadCrossProjectDuplicationsRepositoryStepTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadDuplicationsFromReportStepTest.java similarity index 86% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadDuplicationsFromReportStepTest.java index 4f5373312af..a993b89d68c 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadDuplicationsFromReportStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.Arrays; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.VisitException; +import org.sonar.ce.task.projectanalysis.duplication.DetailedTextBlock; +import org.sonar.ce.task.projectanalysis.duplication.Duplicate; +import org.sonar.ce.task.projectanalysis.duplication.Duplication; +import org.sonar.ce.task.projectanalysis.duplication.DuplicationRepositoryRule; +import org.sonar.ce.task.projectanalysis.duplication.InProjectDuplicate; +import org.sonar.ce.task.projectanalysis.duplication.InnerDuplicate; +import org.sonar.ce.task.projectanalysis.duplication.TextBlock; import org.sonar.scanner.protocol.output.ScannerReport; -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.TreeRootHolderRule; -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.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.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; import static org.sonar.test.ExceptionCauseMatcher.hasType; public class LoadDuplicationsFromReportStepTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadMeasureComputersStepTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadMeasureComputersStepTest.java index da886d81a7b..df68f74079b 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; @@ -30,8 +30,8 @@ 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.task.projectanalysis.measure.MeasureComputersHolderImpl; -import org.sonar.server.computation.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; +import org.sonar.ce.task.projectanalysis.api.measurecomputer.MeasureComputerWrapper; +import org.sonar.ce.task.projectanalysis.measure.MeasureComputersHolderImpl; import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.Lists.newArrayList; @@ -198,7 +198,7 @@ public class LoadMeasureComputersStepTest { @Override public MeasureComputerDefinition define(MeasureComputerDefinitionContext defContext) { // Create a instance of MeasureComputerDefinition without using the builder - return new MeasureComputer.MeasureComputerDefinition(){ + return new MeasureComputer.MeasureComputerDefinition() { @Override public Set getInputMetrics() { return ImmutableSet.of(NCLOC_KEY); @@ -252,8 +252,7 @@ public class LoadMeasureComputersStepTest { new Metric.Builder(NEW_METRIC_1, "metric1", DATA).create(), new Metric.Builder(NEW_METRIC_2, "metric2", MILLISEC).create(), new Metric.Builder(NEW_METRIC_3, "metric3", INT).create(), - new Metric.Builder(NEW_METRIC_4, "metric4", FLOAT).create() - ); + new Metric.Builder(NEW_METRIC_4, "metric4", FLOAT).create()); } } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadPeriodsStepTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadPeriodsStepTest.java index e34f41ce914..be2d57630ef 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadPeriodsStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.tngtech.java.junit.dataprovider.DataProviderRunner; import java.text.SimpleDateFormat; @@ -30,18 +30,18 @@ import org.sonar.api.config.internal.MapSettings; import org.sonar.api.utils.System2; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolderImpl; import org.sonar.db.DbClient; import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; import org.sonar.db.component.SnapshotDto; import org.sonar.db.organization.OrganizationDto; -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.ConfigurationRepository; -import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; -import org.sonar.server.computation.task.projectanalysis.period.Period; -import org.sonar.server.computation.task.projectanalysis.period.PeriodHolderImpl; import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityGateStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadQualityGateStepTest.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityGateStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadQualityGateStepTest.java index 43cdc901f2a..2b188f94607 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityGateStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadQualityGateStepTest.java @@ -17,7 +17,7 @@ * along with this program; 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.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.Optional; import org.junit.Before; @@ -25,11 +25,11 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.config.internal.MapSettings; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.task.projectanalysis.component.ConfigurationRepository; -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 org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; +import org.sonar.ce.task.projectanalysis.qualitygate.MutableQualityGateHolderRule; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGate; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateService; import org.sonar.server.qualitygate.ShortLivingBranchQualityGate; import static java.util.Collections.emptyList; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadQualityProfilesStepTest.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadQualityProfilesStepTest.java index 553267a89eb..cc6aa5da43a 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Optional; import org.assertj.core.data.MapEntry; @@ -25,13 +25,13 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.issue.DumbRule; +import org.sonar.ce.task.projectanalysis.issue.RuleRepositoryRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; +import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolderImpl; import org.sonar.scanner.protocol.Constants; import org.sonar.scanner.protocol.output.ScannerReport; -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-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java index 8a392927a17..95abfba20be 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepTest.java @@ -17,7 +17,7 @@ * along with this program; 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.step; +package org.sonar.ce.task.projectanalysis.step; import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; @@ -25,6 +25,7 @@ import com.tngtech.java.junit.dataprovider.UseDataProvider; import java.util.Collection; import java.util.HashMap; import java.util.Map; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -34,6 +35,11 @@ import org.sonar.api.Plugin; import org.sonar.api.utils.MessageException; import org.sonar.api.utils.System2; import org.sonar.ce.queue.CeTask; +import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.analysis.Organization; +import org.sonar.ce.task.projectanalysis.analysis.ScannerPlugin; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.BranchLoader; import org.sonar.core.platform.PluginInfo; import org.sonar.core.platform.PluginRepository; import org.sonar.db.DbClient; @@ -41,11 +47,6 @@ import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; import org.sonar.db.organization.OrganizationDto; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; -import org.sonar.server.computation.task.projectanalysis.analysis.Organization; -import org.sonar.server.computation.task.projectanalysis.analysis.ScannerPlugin; -import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; -import org.sonar.server.computation.task.projectanalysis.component.BranchLoader; import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.organization.DefaultOrganizationProvider; import org.sonar.server.organization.OrganizationFlags; @@ -188,7 +189,8 @@ public class LoadReportAnalysisMetadataHolderStepTest { .build()); expectedException.expect(MessageException.class); - expectedException.expectMessage("ProjectKey in report (" + otherProject.getDbKey() + ") is not consistent with projectKey under which the report has been submitted (" + PROJECT_KEY + ")"); + expectedException + .expectMessage("ProjectKey in report (" + otherProject.getDbKey() + ") is not consistent with projectKey under which the report has been submitted (" + PROJECT_KEY + ")"); underTest.execute(); } @@ -384,7 +386,7 @@ public class LoadReportAnalysisMetadataHolderStepTest { underTest.execute(); - assertThat(analysisMetadataHolder.getScannerPluginsByKey().values()).extracting(ScannerPlugin::getKey, ScannerPlugin::getBasePluginKey, ScannerPlugin::getUpdatedAt) + Assertions.assertThat(analysisMetadataHolder.getScannerPluginsByKey().values()).extracting(ScannerPlugin::getKey, ScannerPlugin::getBasePluginKey, ScannerPlugin::getUpdatedAt) .containsExactlyInAnyOrder( tuple("java", null, 10L), tuple("php", null, 20L), diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/NewSizeMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/NewSizeMeasuresStepTest.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/NewSizeMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/NewSizeMeasuresStepTest.java index 099ef428674..14f57395662 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/NewSizeMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/NewSizeMeasuresStepTest.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.Arrays; import org.assertj.core.data.Offset; import org.junit.Rule; import org.junit.Test; -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.projectanalysis.period.Period; -import org.sonar.server.computation.task.projectanalysis.period.PeriodHolderRule; -import org.sonar.server.computation.task.projectanalysis.scm.Changeset; -import org.sonar.server.computation.task.projectanalysis.scm.ScmInfoRepositoryRule; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.duplication.DuplicationRepositoryRule; +import org.sonar.ce.task.projectanalysis.duplication.TextBlock; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolderRule; +import org.sonar.ce.task.projectanalysis.scm.Changeset; +import org.sonar.ce.task.projectanalysis.scm.ScmInfoRepositoryRule; import static com.google.common.base.Preconditions.checkArgument; import static org.assertj.core.api.Assertions.assertThat; @@ -45,11 +45,11 @@ import static org.sonar.api.measures.CoreMetrics.NEW_DUPLICATED_LINES_KEY; import static org.sonar.api.measures.CoreMetrics.NEW_LINES; import static org.sonar.api.measures.CoreMetrics.NEW_LINES_KEY; import static org.sonar.api.utils.DateUtils.parseDate; -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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; public class NewSizeMeasuresStepTest { @@ -235,7 +235,7 @@ public class NewSizeMeasuresStepTest { assertRawMeasureValueOnPeriod(MODULE_REF, NEW_DUPLICATED_LINES_KEY, 22d); assertRawMeasureValueOnPeriod(ROOT_REF, NEW_DUPLICATED_LINES_KEY, 22d); } - + @Test public void compute_and_aggregate_duplicated_lines_when_only_some_lines_have_changesets() { // 2 new duplicated lines in each, since only the first 2 lines are new diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistAnalysisPropertiesStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisPropertiesStepTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistAnalysisPropertiesStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisPropertiesStepTest.java index ff3d0191636..cc247b35dbf 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistAnalysisPropertiesStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisPropertiesStepTest.java @@ -17,7 +17,7 @@ * along with this program; 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.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.collect.ImmutableList; import java.util.Arrays; @@ -25,13 +25,13 @@ import java.util.List; import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; import org.sonar.core.util.CloseableIterator; import org.sonar.core.util.UuidFactoryFast; import org.sonar.db.DbTester; import org.sonar.db.component.AnalysisPropertyDto; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReader; import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistComponentsStepTest.java similarity index 81% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistComponentsStepTest.java index 638ae279ec8..7a6134db3ef 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistComponentsStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistComponentsStepTest.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.component.BranchPersister; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.MutableDbIdsRepository; +import org.sonar.ce.task.projectanalysis.component.MutableDisabledComponentsHolder; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.component.ComponentDao; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.server.computation.task.projectanalysis.component.BranchPersister; -import org.sonar.server.computation.task.projectanalysis.component.Component; -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.TreeRootHolder; import static java.util.Collections.emptyList; import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java similarity index 87% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java index 735c2d5e404..eb5a09029eb 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.Arrays; import java.util.Collections; @@ -27,17 +27,16 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.Analysis; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.duplication.CrossProjectDuplicationStatusHolder; import org.sonar.db.DbClient; import org.sonar.db.DbTester; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.task.projectanalysis.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.Component; -import org.sonar.server.computation.task.projectanalysis.component.Component.Status; -import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; -import org.sonar.server.computation.task.projectanalysis.duplication.CrossProjectDuplicationStatusHolder; import org.sonar.server.computation.task.step.ComputationStep; import static java.util.Collections.singletonList; @@ -53,7 +52,7 @@ public class PersistCrossProjectDuplicationIndexStepTest { private static final Component FILE_1 = ReportComponent.builder(Component.Type.FILE, FILE_1_REF).build(); private static final Component FILE_2 = ReportComponent.builder(Component.Type.FILE, FILE_2_REF) - .setStatus(Status.SAME).setUuid(FILE_2_UUID).build(); + .setStatus(Component.Status.SAME).setUuid(FILE_2_UUID).build(); private static final Component PROJECT = ReportComponent.builder(Component.Type.PROJECT, 1) .addChildren(FILE_1) diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistEventsStepTest.java similarity index 83% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistEventsStepTest.java index d8390b90600..ff849d666f8 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.collect.ImmutableList; import java.util.Collections; @@ -26,25 +26,25 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.event.Event; +import org.sonar.ce.task.projectanalysis.event.EventRepository; import org.sonar.core.util.UuidFactory; import org.sonar.core.util.UuidFactoryImpl; import org.sonar.db.DbTester; -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.component.TreeRootHolderRule; -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.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; public class PersistEventsStepTest extends BaseStepTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistExternalRulesStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistExternalRulesStepTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistExternalRulesStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistExternalRulesStepTest.java index aefd8fb0244..a7c58a6be21 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistExternalRulesStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistExternalRulesStepTest.java @@ -17,7 +17,7 @@ * along with this program; 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.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.Optional; import org.junit.Before; @@ -25,16 +25,16 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.issue.RuleRepositoryImpl; import org.sonar.db.DbClient; import org.sonar.db.DbTester; import org.sonar.db.rule.RuleDao; import org.sonar.db.rule.RuleDefinitionDto; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.rule.NewExternalRule; -import org.sonar.server.computation.task.projectanalysis.issue.RuleRepositoryImpl; import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.es.EsTester; import org.sonar.server.rule.ExternalRuleCreator; +import org.sonar.server.rule.NewExternalRule; import org.sonar.server.rule.index.RuleIndexDefinition; import org.sonar.server.rule.index.RuleIndexer; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistFileSourcesStepTest.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistFileSourcesStepTest.java index 84793b8a023..1dfe5faf520 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.collect.Lists; import java.util.Arrays; @@ -28,6 +28,20 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.duplication.Duplication; +import org.sonar.ce.task.projectanalysis.duplication.DuplicationRepositoryRule; +import org.sonar.ce.task.projectanalysis.duplication.InnerDuplicate; +import org.sonar.ce.task.projectanalysis.duplication.TextBlock; +import org.sonar.ce.task.projectanalysis.scm.Changeset; +import org.sonar.ce.task.projectanalysis.scm.ScmInfoRepositoryRule; +import org.sonar.ce.task.projectanalysis.source.SourceLinesHashRepository; +import org.sonar.ce.task.projectanalysis.source.SourceLinesHashRepositoryImpl; +import org.sonar.ce.task.projectanalysis.source.SourceLinesRepositoryRule; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.DbTester; @@ -38,20 +52,6 @@ import org.sonar.db.source.LineHashVersion; 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.task.projectanalysis.batch.BatchReportReaderRule; -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.TreeRootHolderRule; -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.SourceLinesHashRepository; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesHashRepositoryImpl.LineHashesComputer; -import org.sonar.server.computation.task.projectanalysis.source.SourceLinesRepositoryRule; import org.sonar.server.computation.task.step.ComputationStep; import static com.google.common.collect.ImmutableList.of; @@ -86,7 +86,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { public DuplicationRepositoryRule duplicationRepository = DuplicationRepositoryRule.create(treeRootHolder); private SourceLinesHashRepository sourceLinesHashRepository = mock(SourceLinesHashRepository.class); - private LineHashesComputer lineHashesComputer = mock(LineHashesComputer.class); + private SourceLinesHashRepositoryImpl.LineHashesComputer lineHashesComputer = mock(SourceLinesHashRepositoryImpl.LineHashesComputer.class); private DbClient dbClient = dbTester.getDbClient(); private DbSession session = dbTester.getSession(); @@ -109,7 +109,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { @Test public void persist_sources() { initBasicReport(2); - when(lineHashesComputer.getResult()).thenReturn(Lists.newArrayList("137f72c3708c6bd0de00a0e5a69c699b","e6251bcf1a7dc3ba5e7933e325bbe605")); + when(lineHashesComputer.getResult()).thenReturn(Lists.newArrayList("137f72c3708c6bd0de00a0e5a69c699b", "e6251bcf1a7dc3ba5e7933e325bbe605")); underTest.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); @@ -134,7 +134,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { @Test public void persist_source_hashes() { initBasicReport(2); - when(lineHashesComputer.getResult()).thenReturn(Lists.newArrayList("137f72c3708c6bd0de00a0e5a69c699b","e6251bcf1a7dc3ba5e7933e325bbe605")); + when(lineHashesComputer.getResult()).thenReturn(Lists.newArrayList("137f72c3708c6bd0de00a0e5a69c699b", "e6251bcf1a7dc3ba5e7933e325bbe605")); underTest.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistIssuesStepTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistIssuesStepTest.java index c371f75e414..b3c51231db7 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.Arrays; import java.util.Date; @@ -30,6 +30,11 @@ import org.junit.rules.TemporaryFolder; import org.sonar.api.rule.RuleKey; import org.sonar.api.rules.RuleType; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.issue.IssueCache; +import org.sonar.ce.task.projectanalysis.issue.RuleRepositoryImpl; +import org.sonar.ce.task.projectanalysis.issue.UpdateConflictResolver; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.DefaultIssueComment; import org.sonar.core.issue.FieldDiffs; @@ -44,11 +49,6 @@ import org.sonar.db.organization.OrganizationDto; import org.sonar.db.rule.RuleDefinitionDto; import org.sonar.db.rule.RuleTesting; import org.sonar.scanner.protocol.output.ScannerReport; -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.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 org.sonar.server.rule.ExternalRuleCreator; import org.sonar.server.util.cache.DiskCache; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistLiveMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistLiveMeasuresStepTest.java similarity index 86% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistLiveMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistLiveMeasuresStepTest.java index 04793b0dca6..2f96bccdc86 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistLiveMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistLiveMeasuresStepTest.java @@ -17,7 +17,7 @@ * along with this program; 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.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.Optional; import org.junit.Before; @@ -25,32 +25,32 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.measures.Metric; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.ViewsComponent; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.measure.MeasureToMeasureDto; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import org.sonar.db.DbClient; import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; import org.sonar.db.measure.LiveMeasureDto; import org.sonar.db.metric.MetricDto; -import org.sonar.server.computation.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; -import org.sonar.server.project.Project; -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.TreeRootHolderRule; -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.step.ComputationStep; +import org.sonar.server.project.Project; import static org.assertj.core.api.Assertions.assertThat; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; import static org.sonar.db.measure.MeasureTesting.newLiveMeasure; -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; public class PersistLiveMeasuresStepTest extends BaseStepTest { @@ -83,7 +83,8 @@ public class PersistLiveMeasuresStepTest extends BaseStepTest { public void setUp() { MetricDto stringMetricDto = db.measures().insertMetric(m -> m.setKey(STRING_METRIC.getKey()).setValueType(Metric.ValueType.STRING.name())); MetricDto intMetricDto = db.measures().insertMetric(m -> m.setKey(INT_METRIC.getKey()).setValueType(Metric.ValueType.INT.name())); - MetricDto bestValueMMetricDto = db.measures().insertMetric(m -> m.setKey(METRIC_WITH_BEST_VALUE.getKey()).setValueType(Metric.ValueType.INT.name()).setOptimizedBestValue(true).setBestValue(0.0)); + MetricDto bestValueMMetricDto = db.measures() + .insertMetric(m -> m.setKey(METRIC_WITH_BEST_VALUE.getKey()).setValueType(Metric.ValueType.INT.name()).setOptimizedBestValue(true).setBestValue(0.0)); metricRepository.add(stringMetricDto.getId(), STRING_METRIC); metricRepository.add(intMetricDto.getId(), INT_METRIC); metricRepository.add(bestValueMMetricDto.getId(), METRIC_WITH_BEST_VALUE); @@ -153,7 +154,7 @@ public class PersistLiveMeasuresStepTest extends BaseStepTest { assertThatMeasureHasValue(measureOnFileInProject, 42); assertThatMeasureDoesNotExist(measureOnDeletedFileInProject); assertThatMeasureDoesNotExist(otherMeasureOnFileInProject); - assertThatMeasureHasValue(measureInOtherProject, (int)measureInOtherProject.getValue().doubleValue()); + assertThatMeasureHasValue(measureInOtherProject, (int) measureInOtherProject.getValue().doubleValue()); } @Test diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistMeasuresStepTest.java similarity index 86% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistMeasuresStepTest.java index 3711f28ecce..0a383929eb2 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.Optional; import org.junit.Before; @@ -30,25 +30,25 @@ import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; import org.sonar.db.measure.MeasureDto; import org.sonar.db.metric.MetricDto; -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.ReportComponent; -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.measure.MeasureRepositoryRule; -import org.sonar.server.computation.task.projectanalysis.measure.MeasureToMeasureDto; -import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.ViewsComponent; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.measure.MeasureToMeasureDto; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.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.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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; public class PersistMeasuresStepTest extends BaseStepTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistProjectLinksStepTest.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistProjectLinksStepTest.java index 0cf04f2a326..ddc6159d344 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistProjectLinksStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistProjectLinksStepTest.java @@ -17,13 +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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; import org.sonar.core.util.UuidFactory; import org.sonar.core.util.UuidFactoryFast; import org.sonar.db.DbClient; @@ -32,14 +40,6 @@ import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ProjectLinkDto; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; -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.TreeRootHolder; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistScannerContextStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStepTest.java similarity index 93% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistScannerContextStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStepTest.java index 358dee1295d..7b3ef398053 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistScannerContextStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStepTest.java @@ -17,7 +17,7 @@ * along with this program; 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.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.Arrays; import org.junit.ClassRule; @@ -25,11 +25,11 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.ce.queue.CeTask; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; import org.sonar.core.util.CloseableIterator; import org.sonar.db.DbClient; import org.sonar.db.DbTester; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.task.projectanalysis.batch.BatchReportReaderRule; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistTestsStepTest.java similarity index 96% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistTestsStepTest.java index 921552352bb..160e7a0525e 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistTestsStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.Arrays; import java.util.List; @@ -27,6 +27,11 @@ import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; import org.sonar.db.DbClient; import org.sonar.db.DbTester; import org.sonar.db.protobuf.DbFileSources; @@ -34,11 +39,6 @@ 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.task.projectanalysis.batch.BatchReportReaderRule; -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.TreeRootHolderRule; import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PublishTaskResultStepTest.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PublishTaskResultStepTest.java index 713bca96ce8..b876286cd41 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PublishTaskResultStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; import org.sonar.server.computation.taskprocessor.MutableTaskResultHolder; import org.sonar.server.computation.taskprocessor.MutableTaskResultHolderImpl; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PurgeDatastoresStepTest.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PurgeDatastoresStepTest.java index 7ad30a48058..5283a486253 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; @@ -30,16 +30,16 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; import org.sonar.api.config.internal.MapSettings; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; +import org.sonar.ce.task.projectanalysis.component.MutableDbIdsRepositoryRule; +import org.sonar.ce.task.projectanalysis.component.MutableDisabledComponentsHolder; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.ViewsComponent; import org.sonar.db.DbClient; import org.sonar.db.purge.IdUuidPair; import org.sonar.server.computation.dbcleaner.ProjectCleaner; -import org.sonar.server.computation.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.component.ConfigurationRepository; -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.TreeRootHolderRule; -import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent; import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.util.WrapInSingleElementArray; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/QualityGateEventsStepTest.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/QualityGateEventsStepTest.java index 03deaea4de4..daef3366005 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Optional; import org.junit.Before; @@ -25,23 +25,23 @@ import org.junit.Rule; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.sonar.api.notifications.Notification; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.DefaultBranchImpl; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.event.Event; +import org.sonar.ce.task.projectanalysis.event.EventRepository; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.measure.QualityGateStatus; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.db.component.BranchType; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; -import org.sonar.server.project.Project; -import org.sonar.server.computation.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.component.DefaultBranchImpl; -import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolder; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; -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 org.sonar.server.project.Project; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; @@ -52,9 +52,9 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import static org.sonar.api.measures.CoreMetrics.ALERT_STATUS_KEY; -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.ce.task.projectanalysis.measure.Measure.Level.ERROR; +import static org.sonar.ce.task.projectanalysis.measure.Measure.Level.OK; +import static org.sonar.ce.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-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/QualityGateMeasuresStepTest.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/QualityGateMeasuresStepTest.java index 3dca97aa0ee..15178ad7406 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Optional; import java.util.Collections; @@ -32,36 +32,36 @@ 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.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; -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.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 org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.measure.qualitygatedetails.EvaluatedCondition; +import org.sonar.ce.task.projectanalysis.measure.qualitygatedetails.QualityGateDetailsData; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricImpl; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.qualitygate.Condition; +import org.sonar.ce.task.projectanalysis.qualitygate.ConditionStatus; +import org.sonar.ce.task.projectanalysis.qualitygate.EvaluationResult; +import org.sonar.ce.task.projectanalysis.qualitygate.EvaluationResultTextConverter; +import org.sonar.ce.task.projectanalysis.qualitygate.MutableQualityGateStatusHolderRule; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGate; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateHolderRule; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateStatus; +import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateStatusHolder; import static com.google.common.collect.ImmutableList.of; import static org.mockito.ArgumentMatchers.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.task.projectanalysis.measure.Measure.newMeasureBuilder; -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.MeasureAssert.assertThat; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.Level.ERROR; +import static org.sonar.ce.task.projectanalysis.measure.Measure.Level.OK; +import static org.sonar.ce.task.projectanalysis.measure.Measure.Level.WARN; +import static org.sonar.ce.task.projectanalysis.measure.MeasureAssert.assertThat; public class QualityGateMeasuresStepTest { private static final MetricImpl INT_METRIC_1 = createIntMetric(1); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/QualityProfileEventsStepTest.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/QualityProfileEventsStepTest.java index ca0047eb0ff..9ae358912ab 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Optional; import java.util.Arrays; @@ -36,17 +36,17 @@ import org.mockito.stubbing.Answer; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.resources.AbstractLanguage; import org.sonar.api.resources.Language; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.event.Event; +import org.sonar.ce.task.projectanalysis.event.EventRepository; +import org.sonar.ce.task.projectanalysis.language.LanguageRepository; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepository; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepository; import org.sonar.core.util.UtcDateUtils; -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.TreeRootHolderRule; -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.qualityprofile.QPMeasureData; import org.sonar.server.qualityprofile.QualityProfile; @@ -216,13 +216,11 @@ public class QualityProfileEventsStepTest { treeRootHolder.getRoot(), arrayOf( qp(QP_NAME_2, LANGUAGE_KEY_1), qp(QP_NAME_2, LANGUAGE_KEY_2), - qp(QP_NAME_1, LANGUAGE_KEY_1, parseDateTime("2011-04-25T01:05:13+0100")) - ), + qp(QP_NAME_1, LANGUAGE_KEY_1, parseDateTime("2011-04-25T01:05:13+0100"))), arrayOf( qp(QP_NAME_1, LANGUAGE_KEY_1, parseDateTime("2011-04-25T01:05:17+0100")), qp(QP_NAME_2, LANGUAGE_KEY_2), - qp(QP_NAME_2, LANGUAGE_KEY_3) - )); + qp(QP_NAME_2, LANGUAGE_KEY_3))); mockNoLanguageInRepository(); underTest.execute(); @@ -230,8 +228,7 @@ public class QualityProfileEventsStepTest { assertThat(events).extracting("name").containsOnly( "Stop using '" + QP_NAME_2 + "' (" + LANGUAGE_KEY_1 + ")", "Use '" + QP_NAME_2 + "' (" + LANGUAGE_KEY_3 + ")", - "Changes in '" + QP_NAME_1 + "' (" + LANGUAGE_KEY_1 + ")" - ); + "Changes in '" + QP_NAME_1 + "' (" + LANGUAGE_KEY_1 + ")"); } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCommentMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportCommentMeasuresStepTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCommentMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportCommentMeasuresStepTest.java index eacc9889f90..11ff75e3f03 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCommentMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportCommentMeasuresStepTest.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -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.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; @@ -43,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.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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; public class ReportCommentMeasuresStepTest { @@ -89,11 +89,11 @@ public class ReportCommentMeasuresStepTest { builder(DIRECTORY, DIRECTORY_REF) .addChildren( builder(FILE, FILE_1_REF).build(), - builder(FILE, FILE_2_REF).build() - ).build() - ).build() - ).build() - ).build()); + builder(FILE, FILE_2_REF).build()) + .build()) + .build()) + .build()) + .build()); } @Test diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java index 8f9a95b0fad..07de8c510bb 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportComplexityMeasuresStepTest.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; -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.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; @@ -55,14 +55,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.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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ReportComplexityMeasuresStepTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationStepsTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportComputationStepsTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationStepsTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportComputationStepsTest.java index 3df6f260507..eaf6ef87807 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationStepsTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.collect.Lists; import org.junit.Rule; @@ -47,7 +47,7 @@ public class ReportComputationStepsTest { @Test public void instances_throws_ISE_if_container_does_not_have_second_step() { expectedException.expect(IllegalStateException.class); - expectedException.expectMessage("Component not found: class org.sonar.server.computation.task.projectanalysis.step.PersistScannerContextStep"); + expectedException.expectMessage("Component not found: class org.sonar.ce.task.projectanalysis.step.PersistScannerContextStep"); final ExtractReportStep reportExtractionStep = mock(ExtractReportStep.class); ComponentContainer componentContainer = new ComponentContainer() { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java index 82d64c9a12e..91d0a6a7f99 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java @@ -17,12 +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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.DumbDeveloper; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricImpl; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolderRule; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.DbTester; @@ -30,22 +42,10 @@ 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.task.projectanalysis.batch.BatchReportReaderRule; -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.component.TreeRootHolderRule; -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.PeriodHolderRule; import static org.assertj.core.api.Assertions.assertThat; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; import static org.sonar.db.component.SnapshotTesting.newAnalysis; -import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; public class ReportComputeMeasureVariationsStepTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java index df370f0c516..318de5d8c15 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.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.task.projectanalysis.component.FileAttributes; -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 org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.formula.coverage.LinesAndConditionsWithUncoveredMetricKeys; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import static org.assertj.core.api.Assertions.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.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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ReportCoverageMeasuresStepTest { private static final int ROOT_REF = 1; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportLanguageDistributionMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportLanguageDistributionMeasuresStepTest.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportLanguageDistributionMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportLanguageDistributionMeasuresStepTest.java index 944f343a57e..6604529f7d8 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportLanguageDistributionMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportLanguageDistributionMeasuresStepTest.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; -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.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; @@ -34,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.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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; public class ReportLanguageDistributionMeasuresStepTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportNewCoverageMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportNewCoverageMeasuresStepTest.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportNewCoverageMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportNewCoverageMeasuresStepTest.java index 6b4c143d673..73dc6f83d47 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportNewCoverageMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportNewCoverageMeasuresStepTest.java @@ -17,25 +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.task.projectanalysis.step; +package org.sonar.ce.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.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.TreeRootHolderRule; -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.metric.MetricRepositoryRule; -import org.sonar.server.computation.task.projectanalysis.period.Period; -import org.sonar.server.computation.task.projectanalysis.period.PeriodHolderRule; -import org.sonar.server.computation.task.projectanalysis.scm.Changeset; -import org.sonar.server.computation.task.projectanalysis.scm.ScmInfoRepositoryRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.formula.coverage.LinesAndConditionsWithUncoveredMetricKeys; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolderRule; +import org.sonar.ce.task.projectanalysis.scm.Changeset; +import org.sonar.ce.task.projectanalysis.scm.ScmInfoRepositoryRule; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.assertThat; @@ -47,14 +47,14 @@ 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.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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ReportNewCoverageMeasuresStepTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistAnalysisStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportPersistAnalysisStepTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistAnalysisStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportPersistAnalysisStepTest.java index e1387e379c5..c7260262f29 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistAnalysisStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.List; import org.junit.Before; @@ -25,6 +25,13 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.DbIdsRepositoryImpl; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolderRule; import org.sonar.db.DbClient; import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; @@ -33,13 +40,6 @@ import org.sonar.db.component.SnapshotDto; import org.sonar.db.component.SnapshotQuery; import org.sonar.db.component.SnapshotTesting; import org.sonar.db.organization.OrganizationDto; -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.DbIdsRepositoryImpl; -import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; -import org.sonar.server.computation.task.projectanalysis.period.Period; -import org.sonar.server.computation.task.projectanalysis.period.PeriodHolderRule; import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportPersistComponentsStepTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportPersistComponentsStepTest.java index 8ef1a6b0178..29aaef1fc1f 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportPersistComponentsStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import com.google.common.base.Optional; import java.text.SimpleDateFormat; @@ -30,6 +30,16 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.component.BranchPersister; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.DefaultBranchImpl; +import org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.MutableDbIdsRepositoryRule; +import org.sonar.ce.task.projectanalysis.component.MutableDisabledComponentsHolder; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; import org.sonar.core.component.ComponentKeys; import org.sonar.db.DbClient; import org.sonar.db.DbTester; @@ -37,18 +47,8 @@ import org.sonar.db.component.BranchType; import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentTesting; import org.sonar.scanner.protocol.output.ScannerReport; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; -import org.sonar.server.project.Project; -import org.sonar.server.computation.task.projectanalysis.component.BranchPersister; -import org.sonar.server.computation.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.component.DefaultBranchImpl; -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.projectanalysis.component.ReportComponent; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; import org.sonar.server.computation.task.step.ComputationStep; +import org.sonar.server.project.Project; import static org.apache.commons.lang.StringUtils.isEmpty; import static org.apache.commons.lang.StringUtils.trimToNull; @@ -57,14 +57,14 @@ 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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; import static org.sonar.db.component.ComponentDto.UUID_PATH_OF_ROOT; import static org.sonar.db.component.ComponentDto.UUID_PATH_SEPARATOR; import static org.sonar.db.component.ComponentTesting.newDirectory; import static org.sonar.db.component.ComponentTesting.newModuleDto; -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-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportSizeMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportSizeMeasuresStepTest.java similarity index 87% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportSizeMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportSizeMeasuresStepTest.java index af45b32c4a4..0c16ff772ec 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportSizeMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.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.task.projectanalysis.component.FileAttributes; -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 org.sonar.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.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.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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ReportSizeMeasuresStepTest { @@ -199,17 +199,16 @@ public class ReportSizeMeasuresStepTest { assertThat(toEntries(measureRepository.getAddedRawMeasures(componentRef))) .containsOnly( entryOf(LINES_KEY, newMeasureBuilder().create(linesCount)), - entryOf(FILES_KEY, newMeasureBuilder().create(fileCount)) - ); + entryOf(FILES_KEY, newMeasureBuilder().create(fileCount))); } - private void verifyMeasuresOnOtherComponent(int componentRef, @Nullable Integer linesCount, @Nullable Integer fileCount, @Nullable Integer directoryCount, MeasureRepoEntry... otherMeasures) { + private void verifyMeasuresOnOtherComponent(int componentRef, @Nullable Integer linesCount, @Nullable Integer fileCount, @Nullable Integer directoryCount, + MeasureRepoEntry... otherMeasures) { MeasureRepoEntry[] measureRepoEntries = concatIntoArray( otherMeasures, linesCount == null ? null : entryOf(LINES_KEY, newMeasureBuilder().create(linesCount)), fileCount == null ? null : entryOf(FILES_KEY, newMeasureBuilder().create(fileCount)), - directoryCount == null ? null : entryOf(DIRECTORIES_KEY, newMeasureBuilder().create(directoryCount)) - ); + directoryCount == null ? null : entryOf(DIRECTORIES_KEY, newMeasureBuilder().create(directoryCount))); assertThat(toEntries(measureRepository.getAddedRawMeasures(componentRef))) .containsOnly(measureRepoEntries); } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportUnitTestMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportUnitTestMeasuresStepTest.java similarity index 94% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportUnitTestMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportUnitTestMeasuresStepTest.java index 8426f509bc6..7e1982eaa51 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportUnitTestMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportUnitTestMeasuresStepTest.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.assertj.core.data.Offset; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; -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.ce.task.projectanalysis.component.FileAttributes; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; @@ -42,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.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.ce.task.projectanalysis.component.Component.Type.DIRECTORY; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.MODULE; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ReportUnitTestMeasuresStepTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStepTest.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/SendIssueNotificationsStepTest.java index 6678e551536..896884ee566 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.io.IOException; import java.util.Date; @@ -36,19 +36,18 @@ import org.sonar.api.notifications.Notification; import org.sonar.api.rules.RuleType; import org.sonar.api.utils.Duration; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.DefaultBranchImpl; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.issue.IssueCache; +import org.sonar.ce.task.projectanalysis.issue.RuleRepositoryRule; import org.sonar.core.issue.DefaultIssue; import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; import org.sonar.db.rule.RuleDefinitionDto; import org.sonar.db.user.UserDto; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; -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.component.DefaultBranchImpl; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; -import org.sonar.server.computation.task.projectanalysis.issue.IssueCache; -import org.sonar.server.computation.task.projectanalysis.issue.RuleRepositoryRule; import org.sonar.server.computation.task.step.ComputationStep; import org.sonar.server.issue.notification.DistributedMetricStatsInt; import org.sonar.server.issue.notification.IssueChangeNotification; @@ -71,6 +70,9 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.sonar.ce.task.projectanalysis.component.Component.Type; +import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.step.SendIssueNotificationsStep.NOTIF_TYPES; import static org.sonar.db.component.BranchType.PULL_REQUEST; import static org.sonar.db.component.ComponentTesting.newBranchDto; import static org.sonar.db.component.ComponentTesting.newFileDto; @@ -79,8 +81,6 @@ import static org.sonar.db.component.ComponentTesting.newProjectBranch; import static org.sonar.db.issue.IssueTesting.newIssue; import static org.sonar.db.organization.OrganizationTesting.newOrganizationDto; import static org.sonar.db.rule.RuleTesting.newRule; -import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; -import static org.sonar.server.computation.task.projectanalysis.step.SendIssueNotificationsStep.NOTIF_TYPES; public class SendIssueNotificationsStepTest extends BaseStepTest { @@ -92,7 +92,7 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { private static final Duration ISSUE_DURATION = Duration.create(100L); - private static final Component FILE = builder(Component.Type.FILE, 11).build(); + private static final Component FILE = builder(Type.FILE, 11).build(); private static final Component PROJECT = builder(Type.PROJECT, 1) .setVersion(RandomStringUtils.randomAlphanumeric(10)) .addChildren(FILE).build(); @@ -169,7 +169,7 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { stream(backDatedEfforts) .map(effort -> new DefaultIssue().setType(randomRuleType).setEffort(Duration.create(effort)) .setCreationDate(new Date(ANALYSE_DATE - FIVE_MINUTES_IN_MS)))) - .collect(toList()); + .collect(toList()); shuffle(issues); DiskCache.DiskAppender issueCache = this.issueCache.newAppender(); issues.forEach(issueCache::append); @@ -284,14 +284,14 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { Integer[] assignedToOther = IntStream.range(0, 3).mapToObj(i -> 10).toArray(Integer[]::new); List issues = concat(stream(assigned) - .map(effort -> new DefaultIssue().setType(randomRuleType).setEffort(Duration.create(effort)) - .setAssigneeUuid(perceval.getUuid()) - .setCreationDate(new Date(ANALYSE_DATE))), + .map(effort -> new DefaultIssue().setType(randomRuleType).setEffort(Duration.create(effort)) + .setAssigneeUuid(perceval.getUuid()) + .setCreationDate(new Date(ANALYSE_DATE))), stream(assignedToOther) .map(effort -> new DefaultIssue().setType(randomRuleType).setEffort(Duration.create(effort)) .setAssigneeUuid(arthur.getUuid()) .setCreationDate(new Date(ANALYSE_DATE)))) - .collect(toList()); + .collect(toList()); shuffle(issues); IssueCache issueCache = new IssueCache(temp.newFile(), System2.INSTANCE); DiskCache.DiskAppender newIssueCache = issueCache.newAppender(); @@ -307,7 +307,8 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { MyNewIssuesNotification myNewIssuesNotificationMock2 = createMyNewIssuesNotificationMock(); when(newIssuesNotificationFactory.newMyNewIssuesNotification()).thenReturn(myNewIssuesNotificationMock1).thenReturn(myNewIssuesNotificationMock2); - new SendIssueNotificationsStep(issueCache, ruleRepository, treeRootHolder, notificationService, analysisMetadataHolder, newIssuesNotificationFactory, db.getDbClient()).execute(); + new SendIssueNotificationsStep(issueCache, ruleRepository, treeRootHolder, notificationService, analysisMetadataHolder, newIssuesNotificationFactory, db.getDbClient()) + .execute(); verify(notificationService).deliver(myNewIssuesNotificationMock1); Map myNewIssuesNotificationMocksByUsersName = new HashMap<>(); @@ -349,7 +350,7 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { .map(effort -> new DefaultIssue().setType(randomRuleType).setEffort(Duration.create(effort)) .setAssigneeUuid(user.getUuid()) .setCreationDate(new Date(ANALYSE_DATE - FIVE_MINUTES_IN_MS)))) - .collect(toList()); + .collect(toList()); shuffle(issues); DiskCache.DiskAppender issueCache = this.issueCache.newAppender(); issues.forEach(issueCache::append); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SmallChangesetQualityGateSpecialCaseTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/SmallChangesetQualityGateSpecialCaseTest.java similarity index 83% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SmallChangesetQualityGateSpecialCaseTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/SmallChangesetQualityGateSpecialCaseTest.java index 11be6430833..6bc3f0f3930 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SmallChangesetQualityGateSpecialCaseTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/SmallChangesetQualityGateSpecialCaseTest.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; import org.sonar.api.measures.CoreMetrics; -import org.sonar.server.computation.task.projectanalysis.component.Component; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; -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.MetricRepositoryRule; -import org.sonar.server.computation.task.projectanalysis.qualitygate.Condition; -import org.sonar.server.computation.task.projectanalysis.qualitygate.EvaluationResult; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.qualitygate.Condition; +import org.sonar.ce.task.projectanalysis.qualitygate.EvaluationResult; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.sonar.api.measures.CoreMetrics.NEW_BUGS_KEY; import static org.sonar.api.measures.CoreMetrics.NEW_COVERAGE_KEY; -import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; -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.ce.task.projectanalysis.component.ReportComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.Level.ERROR; +import static org.sonar.ce.task.projectanalysis.measure.Measure.Level.OK; +import static org.sonar.ce.task.projectanalysis.measure.Measure.Level.WARN; public class SmallChangesetQualityGateSpecialCaseTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/TriggerViewRefreshStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/TriggerViewRefreshStepTest.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/TriggerViewRefreshStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/TriggerViewRefreshStepTest.java index aa36a257eb9..64aeaa724c3 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/TriggerViewRefreshStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/TriggerViewRefreshStepTest.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Test; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; +import org.sonar.ce.task.projectanalysis.view.TriggerViewRefreshDelegate; import org.sonar.server.project.Project; -import org.sonar.server.computation.task.projectanalysis.view.TriggerViewRefreshDelegate; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -32,7 +32,6 @@ import static org.mockito.Mockito.when; public class TriggerViewRefreshStepTest { private AnalysisMetadataHolder analysisMetadataHolder = mock(AnalysisMetadataHolder.class); - @Test public void execute_has_no_effect_if_constructor_without_delegate() { TriggerViewRefreshStep underTest = new TriggerViewRefreshStep(analysisMetadataHolder); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java index be485d6b703..09fec177391 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java @@ -17,7 +17,7 @@ * along with this program; 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.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.Arrays; import java.util.Date; @@ -27,19 +27,19 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.DbTester; import org.sonar.db.RowNotFoundException; -import org.sonar.db.qualityprofile.QualityProfileDbTester; import org.sonar.db.qualityprofile.QProfileDto; -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.component.TreeRootHolderRule; -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.db.qualityprofile.QualityProfileDbTester; import org.sonar.server.qualityprofile.QPMeasureData; import org.sonar.server.qualityprofile.QualityProfile; @@ -77,7 +77,8 @@ public class UpdateQualityProfilesLastUsedDateStepTest { DbSession dbSession = db.getSession(); QualityProfileDbTester qualityProfileDb = new QualityProfileDbTester(db); - UpdateQualityProfilesLastUsedDateStep underTest = new UpdateQualityProfilesLastUsedDateStep(dbClient, analysisMetadataHolder, treeRootHolder, metricRepository, measureRepository); + UpdateQualityProfilesLastUsedDateStep underTest = new UpdateQualityProfilesLastUsedDateStep(dbClient, analysisMetadataHolder, treeRootHolder, metricRepository, + measureRepository); @Test public void doest_not_update_profiles_when_no_measure() { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ValidateProjectStepTest.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ValidateProjectStepTest.java index eba3815be87..bf584f8a919 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ValidateProjectStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.Date; import org.junit.Rule; @@ -26,6 +26,13 @@ import org.junit.rules.ExpectedException; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.MessageException; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.analysis.Branch; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.DefaultBranchImpl; +import org.sonar.ce.task.projectanalysis.component.ReportComponent; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; import org.sonar.db.DbClient; import org.sonar.db.DbTester; import org.sonar.db.component.ComponentDto; @@ -34,13 +41,6 @@ import org.sonar.db.component.SnapshotTesting; import org.sonar.db.organization.OrganizationDto; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.task.projectanalysis.analysis.Branch; -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.DefaultBranchImpl; -import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; public class ValidateProjectStepTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/VerifyBillingStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/VerifyBillingStepTest.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/VerifyBillingStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/VerifyBillingStepTest.java index 49ec1ba8a99..e278e63de42 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/VerifyBillingStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/VerifyBillingStepTest.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.ArgumentCaptor; import org.sonar.api.utils.MessageException; +import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.analysis.Organization; import org.sonar.db.organization.OrganizationDto; -import org.sonar.server.computation.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; -import org.sonar.server.computation.task.projectanalysis.analysis.Organization; import org.sonar.server.organization.BillingValidations; import org.sonar.server.organization.BillingValidations.BillingValidationsException; import org.sonar.server.organization.BillingValidationsProxy; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCommentMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsCommentMeasuresStepTest.java similarity index 91% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCommentMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsCommentMeasuresStepTest.java index efd16f54f44..7bc652a89c3 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCommentMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsCommentMeasuresStepTest.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -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.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; @@ -43,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.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.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; public class ViewsCommentMeasuresStepTest { @@ -83,13 +83,13 @@ public class ViewsCommentMeasuresStepTest { .addChildren( builder(SUBVIEW, MODULE_REF) .addChildren( - builder(SUBVIEW, SUB_MODULE_REF) - .addChildren( - builder(PROJECT_VIEW, PROJECTVIEW_1_REF).build(), - builder(PROJECT_VIEW, PROJECTVIEW_2_REF).build()) - .build()) + builder(SUBVIEW, SUB_MODULE_REF) + .addChildren( + builder(PROJECT_VIEW, PROJECTVIEW_1_REF).build(), + builder(PROJECT_VIEW, PROJECTVIEW_2_REF).build()) + .build()) .build(), - builder(PROJECT_VIEW, PROJECTVIEW_3_REF).build()) + builder(PROJECT_VIEW, PROJECTVIEW_3_REF).build()) .build()); } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java similarity index 89% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java index b4390f0ce04..293e36e11de 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; -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.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; @@ -55,13 +55,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.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.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ViewsComplexityMeasuresStepTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComputeMeasureVariationsStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsComputeMeasureVariationsStepTest.java similarity index 88% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComputeMeasureVariationsStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsComputeMeasureVariationsStepTest.java index 408c3c1c520..b25aff4ca97 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComputeMeasureVariationsStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsComputeMeasureVariationsStepTest.java @@ -17,12 +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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.ViewsComponent; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.Metric; +import org.sonar.ce.task.projectanalysis.metric.MetricImpl; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolderRule; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.DbTester; @@ -30,17 +41,6 @@ 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.task.projectanalysis.batch.BatchReportReaderRule; -import org.sonar.server.computation.task.projectanalysis.component.Component; -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.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.PeriodHolderRule; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.db.component.SnapshotTesting.newAnalysis; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCoverageMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsCoverageMeasuresStepTest.java similarity index 87% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCoverageMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsCoverageMeasuresStepTest.java index 239faf7a120..4e3721db562 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsCoverageMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.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.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 org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.formula.coverage.LinesAndConditionsWithUncoveredMetricKeys; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import static org.assertj.core.api.Assertions.assertThat; -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.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ViewsCoverageMeasuresStepTest { private static final int ROOT_REF = 1; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsLanguageDistributionMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsLanguageDistributionMeasuresStepTest.java similarity index 85% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsLanguageDistributionMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsLanguageDistributionMeasuresStepTest.java index f34f3fc6ce7..a160518198d 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsLanguageDistributionMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsLanguageDistributionMeasuresStepTest.java @@ -17,24 +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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; -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.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.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.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.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; public class ViewsLanguageDistributionMeasuresStepTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsNewCoverageMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsNewCoverageMeasuresStepTest.java similarity index 87% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsNewCoverageMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsNewCoverageMeasuresStepTest.java index 4e16b6f0fbd..72b7ae29d99 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsNewCoverageMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsNewCoverageMeasuresStepTest.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.task.projectanalysis.step; +package org.sonar.ce.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.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.metric.MetricRepositoryRule; -import org.sonar.server.computation.task.projectanalysis.period.Period; -import org.sonar.server.computation.task.projectanalysis.period.PeriodHolderRule; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.ViewsComponent; +import org.sonar.ce.task.projectanalysis.formula.coverage.LinesAndConditionsWithUncoveredMetricKeys; +import org.sonar.ce.task.projectanalysis.measure.Measure; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolderRule; 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.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.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ViewsNewCoverageMeasuresStepTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistAnalysisStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistAnalysisStepTest.java similarity index 87% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistAnalysisStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistAnalysisStepTest.java index 701f64c84fe..08e92109e9f 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistAnalysisStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.util.List; import org.junit.Before; @@ -25,30 +25,30 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.ViewsComponent; +import org.sonar.ce.task.projectanalysis.period.Period; +import org.sonar.ce.task.projectanalysis.period.PeriodHolderRule; import org.sonar.db.DbClient; 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.db.organization.OrganizationDto; -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.TreeRootHolderRule; -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.PeriodHolderRule; import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; import static org.sonar.core.config.CorePropertyDefinitions.LEAK_PERIOD_MODE_DATE; import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; import static org.sonar.db.component.ComponentTesting.newSubView; import static org.sonar.db.component.ComponentTesting.newView; -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-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistComponentsStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistComponentsStepTest.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistComponentsStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsPersistComponentsStepTest.java index 79f35271a64..16ec376a0f6 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsPersistComponentsStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import java.text.SimpleDateFormat; import java.util.Date; @@ -30,37 +30,35 @@ import org.junit.Test; import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Scopes; import org.sonar.api.utils.System2; +import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; +import org.sonar.ce.task.projectanalysis.component.BranchPersister; +import org.sonar.ce.task.projectanalysis.component.Component; +import org.sonar.ce.task.projectanalysis.component.DefaultBranchImpl; +import org.sonar.ce.task.projectanalysis.component.MutableDbIdsRepositoryRule; +import org.sonar.ce.task.projectanalysis.component.MutableDisabledComponentsHolder; +import org.sonar.ce.task.projectanalysis.component.ProjectViewAttributes; +import org.sonar.ce.task.projectanalysis.component.SubViewAttributes; +import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.component.ViewAttributes; +import org.sonar.ce.task.projectanalysis.component.ViewsComponent; import org.sonar.db.DbClient; 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.db.organization.OrganizationDto; -import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.server.computation.task.projectanalysis.component.BranchPersister; -import org.sonar.server.computation.task.projectanalysis.component.DefaultBranchImpl; -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.SubViewAttributes; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; -import org.sonar.server.computation.task.projectanalysis.component.ViewAttributes; -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.ce.task.projectanalysis.component.ViewAttributes.Type.APPLICATION; +import static org.sonar.ce.task.projectanalysis.component.ViewAttributes.Type.PORTFOLIO; +import static org.sonar.ce.task.projectanalysis.component.ViewsComponent.builder; import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; import static org.sonar.db.component.ComponentTesting.newProjectCopy; import static org.sonar.db.component.ComponentTesting.newSubView; -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.ViewAttributes.Type.APPLICATION; -import static org.sonar.server.computation.task.projectanalysis.component.ViewAttributes.Type.PORTFOLIO; -import static org.sonar.server.computation.task.projectanalysis.component.ViewsComponent.builder; public class ViewsPersistComponentsStepTest extends BaseStepTest { @@ -451,7 +449,7 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest { } private static ViewsComponent.Builder createViewBuilder(ViewAttributes.Type viewType) { - return builder(VIEW, VIEW_KEY) + return builder(Component.Type.VIEW, VIEW_KEY) .setUuid(VIEW_UUID) .setName(VIEW_NAME) .setDescription(VIEW_DESCRIPTION) @@ -459,7 +457,7 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest { } private ViewsComponent.Builder createSubView1Builder(@Nullable String originalViewUuid) { - return builder(SUBVIEW, SUBVIEW_1_KEY) + return builder(Component.Type.SUBVIEW, SUBVIEW_1_KEY) .setUuid(SUBVIEW_1_UUID) .setName(SUBVIEW_1_NAME) .setDescription(SUBVIEW_1_DESCRIPTION) @@ -467,7 +465,7 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest { } private static ViewsComponent.Builder createProjectView1Builder(ComponentDto project, Long analysisDate) { - return builder(PROJECT_VIEW, PROJECT_VIEW_1_KEY) + return builder(Component.Type.PROJECT_VIEW, PROJECT_VIEW_1_KEY) .setUuid(PROJECT_VIEW_1_UUID) .setName(PROJECT_VIEW_1_NAME) .setDescription("project view description is not persisted") diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsSizeMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsSizeMeasuresStepTest.java similarity index 90% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsSizeMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsSizeMeasuresStepTest.java index dc705c38978..94ae2928140 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsSizeMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsSizeMeasuresStepTest.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import javax.annotation.Nullable; import org.junit.Rule; import org.junit.Test; -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 org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import static com.google.common.base.Predicates.notNull; import static com.google.common.collect.FluentIterable.from; @@ -49,13 +49,13 @@ import static org.sonar.api.measures.CoreMetrics.NCLOC; import static org.sonar.api.measures.CoreMetrics.NCLOC_KEY; import static org.sonar.api.measures.CoreMetrics.STATEMENTS; import static org.sonar.api.measures.CoreMetrics.STATEMENTS_KEY; -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.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ViewsSizeMeasuresStepTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsUnitTestMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsUnitTestMeasuresStepTest.java similarity index 92% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsUnitTestMeasuresStepTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsUnitTestMeasuresStepTest.java index 4726fcd6ba8..d17978af25a 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsUnitTestMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ViewsUnitTestMeasuresStepTest.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.task.projectanalysis.step; +package org.sonar.ce.task.projectanalysis.step; import org.junit.Rule; import org.junit.Test; -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.ce.task.projectanalysis.component.TreeRootHolderRule; +import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryRule; +import org.sonar.ce.task.projectanalysis.metric.MetricRepositoryRule; import org.sonar.server.computation.task.step.ComputationStep; import static org.assertj.core.api.Assertions.assertThat; @@ -40,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.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.ce.task.projectanalysis.component.Component.Type.PROJECT_VIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.SUBVIEW; +import static org.sonar.ce.task.projectanalysis.component.Component.Type.VIEW; +import static org.sonar.ce.task.projectanalysis.component.ViewsComponent.builder; +import static org.sonar.ce.task.projectanalysis.measure.Measure.newMeasureBuilder; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.entryOf; +import static org.sonar.ce.task.projectanalysis.measure.MeasureRepoEntry.toEntries; public class ViewsUnitTestMeasuresStepTest { diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTaskTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/webhook/WebhookPostTaskTest.java similarity index 97% rename from server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTaskTest.java rename to server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/webhook/WebhookPostTaskTest.java index 02c27ac314e..829f1b4f418 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTaskTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/webhook/WebhookPostTaskTest.java @@ -17,7 +17,7 @@ * along with this program; 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.webhook; +package org.sonar.ce.task.projectanalysis.webhook; import com.google.common.collect.ImmutableMap; import java.util.Collections; @@ -36,7 +36,7 @@ import org.sonar.api.ce.posttask.Project; import org.sonar.api.ce.posttask.QualityGate; import org.sonar.api.config.Configuration; import org.sonar.api.measures.Metric; -import org.sonar.server.computation.task.projectanalysis.component.ConfigurationRepository; +import org.sonar.ce.task.projectanalysis.component.ConfigurationRepository; import org.sonar.server.qualitygate.Condition; import org.sonar.server.qualitygate.EvaluatedCondition; import org.sonar.server.qualitygate.EvaluatedQualityGate; diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/dbmigration/PopulateFileSourceLineCountTest/file_sources.sql b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/dbmigration/PopulateFileSourceLineCountTest/file_sources.sql similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/dbmigration/PopulateFileSourceLineCountTest/file_sources.sql rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/dbmigration/PopulateFileSourceLineCountTest/file_sources.sql diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1235_add_component_uuid_to_duplications_index.rb b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1235_add_component_uuid_to_duplications_index.rb similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1235_add_component_uuid_to_duplications_index.rb rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1235_add_component_uuid_to_duplications_index.rb diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1236_populate_component_uuid_of_duplications_index.rb b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1236_populate_component_uuid_of_duplications_index.rb similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1236_populate_component_uuid_of_duplications_index.rb rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1236_populate_component_uuid_of_duplications_index.rb diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1237_delete_orphan_duplications_index_rows_without_component.rb b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1237_delete_orphan_duplications_index_rows_without_component.rb similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1237_delete_orphan_duplications_index_rows_without_component.rb rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1237_delete_orphan_duplications_index_rows_without_component.rb diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1238_make_component_uuid_not_null_on_duplications_index.rb b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1238_make_component_uuid_not_null_on_duplications_index.rb similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1238_make_component_uuid_not_null_on_duplications_index.rb rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1238_make_component_uuid_not_null_on_duplications_index.rb diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1239_add_analysis_uuid_to_duplications_index.rb b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1239_add_analysis_uuid_to_duplications_index.rb similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1239_add_analysis_uuid_to_duplications_index.rb rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1239_add_analysis_uuid_to_duplications_index.rb diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1240_populate_analysis_uuid_of_duplications_index.rb b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1240_populate_analysis_uuid_of_duplications_index.rb similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1240_populate_analysis_uuid_of_duplications_index.rb rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1240_populate_analysis_uuid_of_duplications_index.rb diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1241_delete_orphan_duplications_index_rows_without_analysis.rb b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1241_delete_orphan_duplications_index_rows_without_analysis.rb similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1241_delete_orphan_duplications_index_rows_without_analysis.rb rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1241_delete_orphan_duplications_index_rows_without_analysis.rb diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1242_make_analysis_uuid_not_null_on_duplications_index.rb b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1242_make_analysis_uuid_not_null_on_duplications_index.rb similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1242_make_analysis_uuid_not_null_on_duplications_index.rb rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/1242_make_analysis_uuid_not_null_on_duplications_index.rb diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddAnalysisUuidColumnToDuplicationsIndex.java b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddAnalysisUuidColumnToDuplicationsIndex.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddAnalysisUuidColumnToDuplicationsIndex.java rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddAnalysisUuidColumnToDuplicationsIndex.java index d8f2085bf9d..4c669202107 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddAnalysisUuidColumnToDuplicationsIndex.java +++ b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddAnalysisUuidColumnToDuplicationsIndex.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.db.version.v60; +package org.sonar.ce.task.projectanalysis.filemove.FileMoveDetectionStepTest.v1; import java.sql.SQLException; import org.sonar.db.Database; diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddComponentUuidColumnToDuplicationsIndex.java b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddComponentUuidColumnToDuplicationsIndex.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddComponentUuidColumnToDuplicationsIndex.java rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddComponentUuidColumnToDuplicationsIndex.java index 12acc5658c3..905519ed60a 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddComponentUuidColumnToDuplicationsIndex.java +++ b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/AddComponentUuidColumnToDuplicationsIndex.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.db.version.v60; +package org.sonar.ce.task.projectanalysis.filemove.FileMoveDetectionStepTest.v1; import java.sql.SQLException; import org.sonar.db.Database; diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java index 20fe886c891..5f00f70ac5e 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java +++ b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/DeleteOrphanDuplicationsIndexRowsWithoutComponent.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.db.version.v60; +package org.sonar.ce.task.projectanalysis.filemove.FileMoveDetectionStepTest.v1; import java.sql.SQLException; import org.sonar.db.Database; diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java index cabda6cab7f..476f3fef9aa 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java +++ b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v1/MakeComponentUuidNotNullOnDuplicationsIndex.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.db.version.v60; +package org.sonar.ce.task.projectanalysis.filemove.FileMoveDetectionStepTest.v1; import java.sql.SQLException; import org.sonar.db.Database; diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1235_add_component_uuid_and_analysis_uuid_to_duplications_index.rb b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1235_add_component_uuid_and_analysis_uuid_to_duplications_index.rb similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1235_add_component_uuid_and_analysis_uuid_to_duplications_index.rb rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1235_add_component_uuid_and_analysis_uuid_to_duplications_index.rb diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1236_populate_component_uuid_and_analysis_uuid_of_duplications_index.rb b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1236_populate_component_uuid_and_analysis_uuid_of_duplications_index.rb similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1236_populate_component_uuid_and_analysis_uuid_of_duplications_index.rb rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1236_populate_component_uuid_and_analysis_uuid_of_duplications_index.rb diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1237_delete_orphan_duplications_index_rows_without_component_or_analysis.rb b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1237_delete_orphan_duplications_index_rows_without_component_or_analysis.rb similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1237_delete_orphan_duplications_index_rows_without_component_or_analysis.rb rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1237_delete_orphan_duplications_index_rows_without_component_or_analysis.rb diff --git a/server/sonar-ce-task-projectanalysis/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 b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/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-ce-task-projectanalysis/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 rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/1238_make_component_uuid_and_analysis_uuid_not_null_on_duplications_index.rb diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/AddComponentUuidAndAnalysisUuidColumnToDuplicationsIndex.java b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/AddComponentUuidAndAnalysisUuidColumnToDuplicationsIndex.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/AddComponentUuidAndAnalysisUuidColumnToDuplicationsIndex.java rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/AddComponentUuidAndAnalysisUuidColumnToDuplicationsIndex.java index ee4616b25d0..c7811cee9f1 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/AddComponentUuidAndAnalysisUuidColumnToDuplicationsIndex.java +++ b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/AddComponentUuidAndAnalysisUuidColumnToDuplicationsIndex.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.db.version.v60; +package org.sonar.ce.task.projectanalysis.filemove.FileMoveDetectionStepTest.v2; import java.sql.SQLException; import org.sonar.db.Database; diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex.java b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex.java similarity index 95% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex.java rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex.java index 96f9339fa53..403f67bfbcd 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex.java +++ b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/filemove/FileMoveDetectionStepTest/v2/MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.db.version.v60; +package org.sonar.ce.task.projectanalysis.filemove.FileMoveDetectionStepTest.v2; import java.sql.SQLException; import org.sonar.db.Database; diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie.json b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie.json similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie.json rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie.json diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie_conflict.json b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie_conflict.json similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie_conflict.json rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/issue/ScmAccountToUserLoaderTest/charlie_conflict.json diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/SourceLinesCacheTest/load_data.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/issue/SourceLinesCacheTest/load_data.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/issue/SourceLinesCacheTest/load_data.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/issue/SourceLinesCacheTest/load_data.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest/shared.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImplTest/shared.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/measure/MeasureRepositoryImplTest/shared.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImplTest/shared.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/measure/MetricCacheTest/metrics.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/measure/MetricCacheTest/metrics.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/measure/MetricCacheTest/metrics.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/measure/MetricCacheTest/metrics.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest/shared.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/metric/MetricRepositoryImplTest/shared.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/metric/MetricRepositoryImplTest/shared.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/metric/MetricRepositoryImplTest/shared.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest/report-custom-measures.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/CustomMeasuresCopyStepTest/report-custom-measures.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest/report-custom-measures.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/CustomMeasuresCopyStepTest/report-custom-measures.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest/view-custom-measures.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/CustomMeasuresCopyStepTest/view-custom-measures.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest/view-custom-measures.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/CustomMeasuresCopyStepTest/view-custom-measures.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/IndexSourceLinesStepTest/index_source.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/IndexSourceLinesStepTest/index_source.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/IndexSourceLinesStepTest/index_source.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/IndexSourceLinesStepTest/index_source.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/IndexTestsStepTest/index_source.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/IndexTestsStepTest/index_source.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/IndexTestsStepTest/index_source.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/IndexTestsStepTest/index_source.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file-result.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file-result.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file-result.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file-result.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistDuplicationMeasuresStepTest/persist_duplication_on_same_file.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/add_events-result.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistEventsStepTest/add_events-result.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/add_events-result.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistEventsStepTest/add_events-result.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/add_version_event-result.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistEventsStepTest/add_version_event-result.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/add_version_event-result.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistEventsStepTest/add_version_event-result.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/empty.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistEventsStepTest/empty.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/empty.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistEventsStepTest/empty.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version-result.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version-result.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version-result.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version-result.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistEventsStepTest/keep_one_event_by_version.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/nothing_to_do_when_no_events_in_report.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistEventsStepTest/nothing_to_do_when_no_events_in_report.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/nothing_to_do_when_no_events_in_report.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistEventsStepTest/nothing_to_do_when_no_events_in_report.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/persist_report_events_with_component_children-result.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistEventsStepTest/persist_report_events_with_component_children-result.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest/persist_report_events_with_component_children-result.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistEventsStepTest/persist_report_events_with_component_children-result.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest/shared.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistMeasuresStepTest/shared.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistMeasuresStepTest/shared.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistMeasuresStepTest/shared.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/empty.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/empty.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/empty.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/empty.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-index-result.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-index-result.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-index-result.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-index-result.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-report-result.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-report-result.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-report-result.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/PersistNumberOfDaysSinceLastCommitStepTest/insert-from-report-result.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/ReportExtractionStepTest/demozip.zip b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/ReportExtractionStepTest/demozip.zip similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/ReportExtractionStepTest/demozip.zip rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/ReportExtractionStepTest/demozip.zip diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/empty.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/SwitchSnapshotStepTest/empty.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/empty.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/SwitchSnapshotStepTest/empty.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots-result.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots-result.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots-result.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots-result.xml diff --git a/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots.xml b/server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots.xml similarity index 100% rename from server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/server/computation/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots.xml rename to server/sonar-ce-task-projectanalysis/src/test/resources/org/sonar/ce/task/projectanalysis/step/SwitchSnapshotStepTest/snapshots.xml 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 6039f9f9d26..1812686e410 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 @@ -57,7 +57,8 @@ import org.sonar.ce.platform.CECoreExtensionsInstaller; import org.sonar.ce.platform.ComputeEngineExtensionInstaller; import org.sonar.ce.queue.CeQueueCleaner; import org.sonar.ce.queue.PurgeCeActivities; -import org.sonar.server.computation.task.projectanalysis.analysis.ProjectConfigurationFactory; +import org.sonar.ce.task.projectanalysis.ProjectAnalysisTaskModule; +import org.sonar.ce.task.projectanalysis.analysis.ProjectConfigurationFactory; import org.sonar.ce.taskprocessor.CeProcessingScheduler; import org.sonar.ce.taskprocessor.CeTaskProcessorModule; import org.sonar.ce.user.CeUserSession; @@ -87,7 +88,6 @@ import org.sonar.process.logging.LogbackHelper; import org.sonar.server.component.ComponentFinder; import org.sonar.server.component.ComponentUpdater; import org.sonar.server.component.index.ComponentIndexer; -import org.sonar.server.computation.task.projectanalysis.ProjectAnalysisTaskModule; import org.sonar.server.config.ConfigurationProvider; import org.sonar.server.debt.DebtModelPluginRepository; import org.sonar.server.debt.DebtRulesXMLImporter; diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueueImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueueImpl.java index 47613afb776..76ed4abf0a6 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueueImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueueImpl.java @@ -23,7 +23,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; -import java.util.List; import java.util.Optional; import java.util.Set; import javax.annotation.CheckForNull; @@ -34,13 +33,13 @@ import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.ce.container.ComputeEngineStatus; import org.sonar.ce.monitoring.CEQueueStatus; +import org.sonar.ce.task.projectanalysis.component.VisitException; import org.sonar.core.util.UuidFactory; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.ce.CeActivityDto; import org.sonar.db.ce.CeQueueDao; import org.sonar.db.ce.CeQueueDto; -import org.sonar.server.computation.task.projectanalysis.component.VisitException; import org.sonar.server.computation.task.step.TypedException; import org.sonar.server.organization.DefaultOrganizationProvider; diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java index 5701b2f54d7..365340a59a8 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java @@ -39,7 +39,7 @@ import org.sonar.ce.queue.CeTask; import org.sonar.ce.queue.InternalCeQueue; import org.sonar.db.ce.CeActivityDto; import org.sonar.db.ce.CeTaskTypes; -import org.sonar.server.computation.task.projectanalysis.taskprocessor.ReportTaskProcessor; +import org.sonar.ce.task.projectanalysis.taskprocessor.ReportTaskProcessor; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; -- 2.39.5