From 556bb9e43c9b5119c8830bf4abcffef8c56256a3 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Wed, 5 Mar 2014 10:28:40 +0100 Subject: [PATCH] Move WorkDuration API to internal package as it will be refactored is 4.3 --- .../org/sonar/plugins/core/CorePlugin.java | 2 +- .../core/issue/IssueTrackingDecorator.java | 2 +- .../issue/IssueTrackingDecoratorTest.java | 2 +- .../NewTechnicalDebtDecoratorTest.java | 2 +- .../batch/bootstrap/BootstrapContainer.java | 2 +- .../sonar/batch/debt/RuleDebtCalculator.java | 2 +- .../batch/scan/ProjectScanContainer.java | 30 +++---------------- .../sonar/batch/debt/DebtModelLoaderTest.java | 2 +- .../batch/debt/RuleDebtCalculatorTest.java | 2 +- .../core/i18n/WorkDurationFormatter.java | 4 +-- .../TechnicalDebtXMLImporter.java | 2 +- .../technicaldebt/db/CharacteristicDto.java | 2 +- .../core/i18n/WorkDurationFormatterTest.java | 2 +- .../DefaultTechnicalDebtManagerTest.java | 2 +- .../DefaultTechnicalDebtModelTest.java | 2 +- .../TechnicalDebtModelSynchronizerTest.java | 2 +- .../TechnicalDebtXMLImporterTest.java | 2 +- .../db/CharacteristicDtoTest.java | 2 +- .../api/technicaldebt/batch/Requirement.java | 2 +- .../batch/internal/DefaultRequirement.java | 2 +- .../technicaldebt/server/Characteristic.java | 2 +- .../internal/DefaultCharacteristic.java | 2 +- .../utils/{ => internal}/WorkDuration.java | 3 +- .../{ => internal}/WorkDurationFactory.java | 2 +- .../internal/DefaultRequirementTest.java | 2 +- .../internal/DefaultCharacteristicTest.java | 2 +- .../WorkDurationFactoryTest.java | 2 +- .../{ => internal}/WorkDurationTest.java | 2 +- .../org/sonar/server/platform/Platform.java | 2 +- .../server/technicaldebt/DebtService.java | 4 +-- .../server/technicaldebt/DebtServiceTest.java | 4 +-- 31 files changed, 38 insertions(+), 59 deletions(-) rename sonar-plugin-api/src/main/java/org/sonar/api/utils/{ => internal}/WorkDuration.java (99%) rename sonar-plugin-api/src/main/java/org/sonar/api/utils/{ => internal}/WorkDurationFactory.java (98%) rename sonar-plugin-api/src/test/java/org/sonar/api/utils/{ => internal}/WorkDurationFactoryTest.java (98%) rename sonar-plugin-api/src/test/java/org/sonar/api/utils/{ => internal}/WorkDurationTest.java (99%) diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java index 0031a119e2e..2125611d25b 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java @@ -24,7 +24,7 @@ import org.sonar.api.*; import org.sonar.api.checks.NoSonarFilter; import org.sonar.api.config.PropertyDefinition; import org.sonar.api.resources.Qualifiers; -import org.sonar.api.utils.WorkDurationFactory; +import org.sonar.api.utils.internal.WorkDurationFactory; import org.sonar.batch.components.PastSnapshotFinder; import org.sonar.batch.debt.IssueChangelogDebtCalculator; import org.sonar.batch.issue.ignore.IssueExclusionsConfiguration; diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingDecorator.java index f6cbb572a0d..67c362054a1 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingDecorator.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingDecorator.java @@ -39,7 +39,7 @@ import org.sonar.api.rules.ActiveRule; import org.sonar.api.rules.Rule; import org.sonar.api.rules.RuleFinder; import org.sonar.api.utils.KeyValueFormat; -import org.sonar.api.utils.WorkDurationFactory; +import org.sonar.api.utils.internal.WorkDurationFactory; import org.sonar.batch.issue.IssueCache; import org.sonar.batch.scan.LastSnapshots; import org.sonar.core.issue.IssueUpdater; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/IssueTrackingDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/IssueTrackingDecoratorTest.java index 3f9531b9baa..95e42c2f698 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/IssueTrackingDecoratorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/IssueTrackingDecoratorTest.java @@ -38,7 +38,7 @@ import org.sonar.api.resources.Resource; import org.sonar.api.rule.RuleKey; import org.sonar.api.rules.Rule; import org.sonar.api.rules.RuleFinder; -import org.sonar.api.utils.WorkDurationFactory; +import org.sonar.api.utils.internal.WorkDurationFactory; import org.sonar.batch.issue.IssueCache; import org.sonar.batch.scan.LastSnapshots; import org.sonar.core.issue.IssueUpdater; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/technicaldebt/NewTechnicalDebtDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/technicaldebt/NewTechnicalDebtDecoratorTest.java index df2c8944b0b..184086d9f3a 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/technicaldebt/NewTechnicalDebtDecoratorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/technicaldebt/NewTechnicalDebtDecoratorTest.java @@ -41,7 +41,7 @@ import org.sonar.api.measures.Measure; import org.sonar.api.measures.Metric; import org.sonar.api.resources.Resource; import org.sonar.api.test.IsMeasure; -import org.sonar.api.utils.WorkDurationFactory; +import org.sonar.api.utils.internal.WorkDurationFactory; import org.sonar.batch.components.Period; import org.sonar.batch.components.TimeMachineConfiguration; import org.sonar.batch.debt.IssueChangelogDebtCalculator; diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapContainer.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapContainer.java index da73f5f7e95..88a43090fbd 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapContainer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapContainer.java @@ -26,8 +26,8 @@ import org.sonar.api.platform.ComponentContainer; import org.sonar.api.platform.PluginMetadata; import org.sonar.api.utils.HttpDownloader; import org.sonar.api.utils.UriReader; -import org.sonar.api.utils.WorkDurationFactory; import org.sonar.api.utils.internal.TempFolderCleaner; +import org.sonar.api.utils.internal.WorkDurationFactory; import org.sonar.batch.components.*; import org.sonar.core.config.Logback; import org.sonar.core.i18n.DefaultI18n; diff --git a/sonar-batch/src/main/java/org/sonar/batch/debt/RuleDebtCalculator.java b/sonar-batch/src/main/java/org/sonar/batch/debt/RuleDebtCalculator.java index e3e6449a4d4..2352e791984 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/debt/RuleDebtCalculator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/debt/RuleDebtCalculator.java @@ -27,7 +27,7 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.technicaldebt.batch.Requirement; import org.sonar.api.technicaldebt.batch.TechnicalDebtModel; import org.sonar.api.technicaldebt.batch.internal.DefaultRequirement; -import org.sonar.api.utils.WorkDuration; +import org.sonar.api.utils.internal.WorkDuration; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java index c86e1fc25c6..e6ac170f8f2 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java @@ -31,41 +31,19 @@ import org.sonar.api.resources.Languages; import org.sonar.api.resources.Project; import org.sonar.api.scan.filesystem.PathResolver; import org.sonar.api.utils.SonarException; -import org.sonar.api.utils.WorkDurationFactory; +import org.sonar.api.utils.internal.WorkDurationFactory; import org.sonar.batch.DefaultFileLinesContextFactory; import org.sonar.batch.DefaultResourceCreationLock; import org.sonar.batch.ProjectConfigurator; import org.sonar.batch.ProjectTree; -import org.sonar.batch.bootstrap.BootstrapSettings; -import org.sonar.batch.bootstrap.ExtensionInstaller; -import org.sonar.batch.bootstrap.ExtensionMatcher; -import org.sonar.batch.bootstrap.ExtensionUtils; -import org.sonar.batch.bootstrap.MetricProvider; +import org.sonar.batch.bootstrap.*; import org.sonar.batch.components.PeriodsDefinition; import org.sonar.batch.debt.DebtModelLoader; import org.sonar.batch.debt.DebtModelProvider; import org.sonar.batch.debt.IssueChangelogDebtCalculator; import org.sonar.batch.debt.RuleDebtCalculator; -import org.sonar.batch.index.Caches; -import org.sonar.batch.index.ComponentDataCache; -import org.sonar.batch.index.ComponentDataPersister; -import org.sonar.batch.index.DefaultIndex; -import org.sonar.batch.index.DefaultPersistenceManager; -import org.sonar.batch.index.DefaultResourcePersister; -import org.sonar.batch.index.DependencyPersister; -import org.sonar.batch.index.EventPersister; -import org.sonar.batch.index.LinkPersister; -import org.sonar.batch.index.MeasurePersister; -import org.sonar.batch.index.MemoryOptimizer; -import org.sonar.batch.index.ResourceCache; -import org.sonar.batch.index.ResourceKeyMigration; -import org.sonar.batch.index.SnapshotCache; -import org.sonar.batch.index.SourcePersister; -import org.sonar.batch.issue.DefaultProjectIssues; -import org.sonar.batch.issue.DeprecatedViolations; -import org.sonar.batch.issue.IssueCache; -import org.sonar.batch.issue.IssuePersister; -import org.sonar.batch.issue.ScanIssueStorage; +import org.sonar.batch.index.*; +import org.sonar.batch.issue.*; import org.sonar.batch.phases.GraphPersister; import org.sonar.batch.profiling.PhasesSumUpTimeProfiler; import org.sonar.batch.qualitygate.ProjectAlerts; diff --git a/sonar-batch/src/test/java/org/sonar/batch/debt/DebtModelLoaderTest.java b/sonar-batch/src/test/java/org/sonar/batch/debt/DebtModelLoaderTest.java index e22c6c978f9..2de08c8f77a 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/debt/DebtModelLoaderTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/debt/DebtModelLoaderTest.java @@ -31,7 +31,7 @@ import org.sonar.api.rules.RuleFinder; import org.sonar.api.rules.RuleQuery; import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic; import org.sonar.api.technicaldebt.batch.internal.DefaultRequirement; -import org.sonar.api.utils.WorkDuration; +import org.sonar.api.utils.internal.WorkDuration; import org.sonar.core.technicaldebt.DefaultTechnicalDebtModel; import org.sonar.core.technicaldebt.db.CharacteristicDao; import org.sonar.core.technicaldebt.db.CharacteristicDto; diff --git a/sonar-batch/src/test/java/org/sonar/batch/debt/RuleDebtCalculatorTest.java b/sonar-batch/src/test/java/org/sonar/batch/debt/RuleDebtCalculatorTest.java index 96ecfd2edf0..59cd9c3efbd 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/debt/RuleDebtCalculatorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/debt/RuleDebtCalculatorTest.java @@ -30,7 +30,7 @@ import org.sonar.api.issue.internal.DefaultIssue; import org.sonar.api.rule.RuleKey; import org.sonar.api.technicaldebt.batch.TechnicalDebtModel; import org.sonar.api.technicaldebt.batch.internal.DefaultRequirement; -import org.sonar.api.utils.WorkDuration; +import org.sonar.api.utils.internal.WorkDuration; import static org.fest.assertions.Assertions.assertThat; import static org.fest.assertions.Fail.fail; diff --git a/sonar-core/src/main/java/org/sonar/core/i18n/WorkDurationFormatter.java b/sonar-core/src/main/java/org/sonar/core/i18n/WorkDurationFormatter.java index af7b709e5d5..93d652c2757 100644 --- a/sonar-core/src/main/java/org/sonar/core/i18n/WorkDurationFormatter.java +++ b/sonar-core/src/main/java/org/sonar/core/i18n/WorkDurationFormatter.java @@ -24,8 +24,8 @@ import org.apache.commons.lang.builder.ReflectionToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; import org.sonar.api.BatchExtension; import org.sonar.api.ServerComponent; -import org.sonar.api.utils.WorkDuration; -import org.sonar.api.utils.WorkDurationFactory; +import org.sonar.api.utils.internal.WorkDuration; +import org.sonar.api.utils.internal.WorkDurationFactory; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporter.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporter.java index 758e8bb599e..12c307dd004 100644 --- a/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporter.java +++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporter.java @@ -37,7 +37,7 @@ import org.sonar.api.rules.Rule; import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic; import org.sonar.api.technicaldebt.batch.internal.DefaultRequirement; import org.sonar.api.utils.ValidationMessages; -import org.sonar.api.utils.WorkDuration; +import org.sonar.api.utils.internal.WorkDuration; import org.sonar.core.technicaldebt.db.CharacteristicDto; import javax.annotation.CheckForNull; diff --git a/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDto.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDto.java index acbb5e56245..18a1bb9034d 100644 --- a/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDto.java +++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDto.java @@ -23,7 +23,7 @@ package org.sonar.core.technicaldebt.db; import org.sonar.api.rule.RuleKey; import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic; import org.sonar.api.technicaldebt.batch.internal.DefaultRequirement; -import org.sonar.api.utils.WorkDuration; +import org.sonar.api.utils.internal.WorkDuration; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/sonar-core/src/test/java/org/sonar/core/i18n/WorkDurationFormatterTest.java b/sonar-core/src/test/java/org/sonar/core/i18n/WorkDurationFormatterTest.java index 5185afd4d4c..984b2f78364 100644 --- a/sonar-core/src/test/java/org/sonar/core/i18n/WorkDurationFormatterTest.java +++ b/sonar-core/src/test/java/org/sonar/core/i18n/WorkDurationFormatterTest.java @@ -24,7 +24,7 @@ import org.junit.Before; import org.junit.Test; import org.sonar.api.CoreProperties; import org.sonar.api.config.Settings; -import org.sonar.api.utils.WorkDurationFactory; +import org.sonar.api.utils.internal.WorkDurationFactory; import static com.google.common.collect.Lists.newArrayList; import static org.fest.assertions.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtManagerTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtManagerTest.java index f6369fe9209..9095488504c 100644 --- a/sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtManagerTest.java +++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtManagerTest.java @@ -29,7 +29,7 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rules.Rule; import org.sonar.api.rules.RuleFinder; import org.sonar.api.technicaldebt.server.Characteristic; -import org.sonar.api.utils.WorkDuration; +import org.sonar.api.utils.internal.WorkDuration; import org.sonar.core.technicaldebt.db.CharacteristicDao; import org.sonar.core.technicaldebt.db.CharacteristicDto; diff --git a/sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtModelTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtModelTest.java index 246269c48c3..ef857e167d1 100644 --- a/sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtModelTest.java +++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtModelTest.java @@ -25,7 +25,7 @@ import org.junit.Test; import org.sonar.api.rule.RuleKey; import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic; import org.sonar.api.technicaldebt.batch.internal.DefaultRequirement; -import org.sonar.api.utils.WorkDuration; +import org.sonar.api.utils.internal.WorkDuration; import static org.fest.assertions.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtModelSynchronizerTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtModelSynchronizerTest.java index 9baa526ce67..5419bb96978 100644 --- a/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtModelSynchronizerTest.java +++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtModelSynchronizerTest.java @@ -35,7 +35,7 @@ import org.sonar.api.rules.Rule; import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic; import org.sonar.api.technicaldebt.batch.internal.DefaultRequirement; import org.sonar.api.utils.ValidationMessages; -import org.sonar.api.utils.WorkDuration; +import org.sonar.api.utils.internal.WorkDuration; import org.sonar.core.persistence.MyBatis; import org.sonar.core.technicaldebt.db.CharacteristicDao; import org.sonar.core.technicaldebt.db.CharacteristicDto; diff --git a/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest.java index 1b5133a94fb..64c5dea9492 100644 --- a/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest.java +++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest.java @@ -32,7 +32,7 @@ import org.sonar.api.rules.RuleQuery; import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic; import org.sonar.api.technicaldebt.batch.internal.DefaultRequirement; import org.sonar.api.utils.ValidationMessages; -import org.sonar.api.utils.WorkDuration; +import org.sonar.api.utils.internal.WorkDuration; import java.io.IOException; diff --git a/sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDtoTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDtoTest.java index 9544b529b4f..f6730185360 100644 --- a/sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDtoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDtoTest.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.sonar.api.rule.RuleKey; import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic; import org.sonar.api.technicaldebt.batch.internal.DefaultRequirement; -import org.sonar.api.utils.WorkDuration; +import org.sonar.api.utils.internal.WorkDuration; import java.util.Date; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/batch/Requirement.java b/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/batch/Requirement.java index 60e41eb5e96..31f2ff781ed 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/batch/Requirement.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/batch/Requirement.java @@ -21,8 +21,8 @@ package org.sonar.api.technicaldebt.batch; import org.sonar.api.rule.RuleKey; -import org.sonar.api.utils.WorkDuration; import org.sonar.api.utils.WorkUnit; +import org.sonar.api.utils.internal.WorkDuration; import java.util.Date; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/batch/internal/DefaultRequirement.java b/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/batch/internal/DefaultRequirement.java index a028a567e73..b46196312a2 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/batch/internal/DefaultRequirement.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/batch/internal/DefaultRequirement.java @@ -25,8 +25,8 @@ import org.apache.commons.lang.builder.ToStringStyle; import org.picocontainer.annotations.Nullable; import org.sonar.api.rule.RuleKey; import org.sonar.api.technicaldebt.batch.Requirement; -import org.sonar.api.utils.WorkDuration; import org.sonar.api.utils.WorkUnit; +import org.sonar.api.utils.internal.WorkDuration; import javax.annotation.CheckForNull; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/server/Characteristic.java b/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/server/Characteristic.java index 0b016e172bc..1befa3cb282 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/server/Characteristic.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/server/Characteristic.java @@ -21,8 +21,8 @@ package org.sonar.api.technicaldebt.server; import org.sonar.api.rule.RuleKey; -import org.sonar.api.utils.WorkDuration; import org.sonar.api.utils.WorkUnit; +import org.sonar.api.utils.internal.WorkDuration; import javax.annotation.CheckForNull; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/server/internal/DefaultCharacteristic.java b/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/server/internal/DefaultCharacteristic.java index 5f95d54fff7..12e8d64d562 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/server/internal/DefaultCharacteristic.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/server/internal/DefaultCharacteristic.java @@ -24,8 +24,8 @@ import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; import org.sonar.api.rule.RuleKey; import org.sonar.api.technicaldebt.server.Characteristic; -import org.sonar.api.utils.WorkDuration; import org.sonar.api.utils.WorkUnit; +import org.sonar.api.utils.internal.WorkDuration; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/WorkDuration.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/WorkDuration.java similarity index 99% rename from sonar-plugin-api/src/main/java/org/sonar/api/utils/WorkDuration.java rename to sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/WorkDuration.java index 1f8703ebfe5..c6c0319495f 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/WorkDuration.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/WorkDuration.java @@ -18,13 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.api.utils; +package org.sonar.api.utils.internal; import com.google.common.annotations.VisibleForTesting; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; import javax.annotation.Nullable; + import java.io.Serializable; /** diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/WorkDurationFactory.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/WorkDurationFactory.java similarity index 98% rename from sonar-plugin-api/src/main/java/org/sonar/api/utils/WorkDurationFactory.java rename to sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/WorkDurationFactory.java index 13175191bb7..442f68998f9 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/WorkDurationFactory.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/WorkDurationFactory.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.api.utils; +package org.sonar.api.utils.internal; import org.sonar.api.BatchComponent; import org.sonar.api.CoreProperties; diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/technicaldebt/batch/internal/DefaultRequirementTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/technicaldebt/batch/internal/DefaultRequirementTest.java index 57cb94e3ec6..5420f55fa73 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/technicaldebt/batch/internal/DefaultRequirementTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/technicaldebt/batch/internal/DefaultRequirementTest.java @@ -22,8 +22,8 @@ package org.sonar.api.technicaldebt.batch.internal; import org.junit.Test; import org.sonar.api.rule.RuleKey; -import org.sonar.api.utils.WorkDuration; import org.sonar.api.utils.WorkUnit; +import org.sonar.api.utils.internal.WorkDuration; import java.text.SimpleDateFormat; diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/technicaldebt/server/internal/DefaultCharacteristicTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/technicaldebt/server/internal/DefaultCharacteristicTest.java index 4ae4d77241b..fbba16605f3 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/technicaldebt/server/internal/DefaultCharacteristicTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/technicaldebt/server/internal/DefaultCharacteristicTest.java @@ -22,8 +22,8 @@ package org.sonar.api.technicaldebt.server.internal; import org.junit.Test; import org.sonar.api.rule.RuleKey; -import org.sonar.api.utils.WorkDuration; import org.sonar.api.utils.WorkUnit; +import org.sonar.api.utils.internal.WorkDuration; import static org.fest.assertions.Assertions.assertThat; diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/WorkDurationFactoryTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/internal/WorkDurationFactoryTest.java similarity index 98% rename from sonar-plugin-api/src/test/java/org/sonar/api/utils/WorkDurationFactoryTest.java rename to sonar-plugin-api/src/test/java/org/sonar/api/utils/internal/WorkDurationFactoryTest.java index c9b1652903d..735ab46fc8c 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/WorkDurationFactoryTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/internal/WorkDurationFactoryTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.api.utils; +package org.sonar.api.utils.internal; import org.junit.Before; import org.junit.Test; diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/WorkDurationTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/internal/WorkDurationTest.java similarity index 99% rename from sonar-plugin-api/src/test/java/org/sonar/api/utils/WorkDurationTest.java rename to sonar-plugin-api/src/test/java/org/sonar/api/utils/internal/WorkDurationTest.java index ddf60903360..c52aac96b8e 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/WorkDurationTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/internal/WorkDurationTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.api.utils; +package org.sonar.api.utils.internal; import org.junit.Test; diff --git a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java index 17ab1030baa..1fb708fb730 100644 --- a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java +++ b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java @@ -35,8 +35,8 @@ import org.sonar.api.rules.XMLRuleParser; import org.sonar.api.utils.HttpDownloader; import org.sonar.api.utils.TimeProfiler; import org.sonar.api.utils.UriReader; -import org.sonar.api.utils.WorkDurationFactory; import org.sonar.api.utils.internal.TempFolderCleaner; +import org.sonar.api.utils.internal.WorkDurationFactory; import org.sonar.core.component.SnapshotPerspectives; import org.sonar.core.component.db.ComponentDao; import org.sonar.core.config.Logback; diff --git a/sonar-server/src/main/java/org/sonar/server/technicaldebt/DebtService.java b/sonar-server/src/main/java/org/sonar/server/technicaldebt/DebtService.java index 540193cd19f..d7c838eccfa 100644 --- a/sonar-server/src/main/java/org/sonar/server/technicaldebt/DebtService.java +++ b/sonar-server/src/main/java/org/sonar/server/technicaldebt/DebtService.java @@ -22,8 +22,8 @@ package org.sonar.server.technicaldebt; import org.sonar.api.ServerComponent; import org.sonar.api.technicaldebt.server.Characteristic; -import org.sonar.api.utils.WorkDuration; -import org.sonar.api.utils.WorkDurationFactory; +import org.sonar.api.utils.internal.WorkDuration; +import org.sonar.api.utils.internal.WorkDurationFactory; import org.sonar.core.technicaldebt.DefaultTechnicalDebtManager; import javax.annotation.CheckForNull; diff --git a/sonar-server/src/test/java/org/sonar/server/technicaldebt/DebtServiceTest.java b/sonar-server/src/test/java/org/sonar/server/technicaldebt/DebtServiceTest.java index d5292636a74..f60b78dae01 100644 --- a/sonar-server/src/test/java/org/sonar/server/technicaldebt/DebtServiceTest.java +++ b/sonar-server/src/test/java/org/sonar/server/technicaldebt/DebtServiceTest.java @@ -25,8 +25,8 @@ import org.sonar.api.CoreProperties; import org.sonar.api.config.Settings; import org.sonar.api.technicaldebt.server.Characteristic; import org.sonar.api.technicaldebt.server.internal.DefaultCharacteristic; -import org.sonar.api.utils.WorkDuration; -import org.sonar.api.utils.WorkDurationFactory; +import org.sonar.api.utils.internal.WorkDuration; +import org.sonar.api.utils.internal.WorkDurationFactory; import org.sonar.core.technicaldebt.DefaultTechnicalDebtManager; import java.util.List; -- 2.39.5