From d4cd47701aaedd1a8596f85e902cba6c52c2bae2 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Mon, 10 Mar 2014 13:47:14 +0100 Subject: [PATCH] revert renaming of org.sonar.core.technicaldebt to org.sonar.core.debt as sonar-core module is used by Views Plugin --- .../src/main/java/org/sonar/batch/debt/DebtModelLoader.java | 6 +++--- .../test/java/org/sonar/batch/debt/DebtModelLoaderTest.java | 6 +++--- .../src/main/java/org/sonar/core/persistence/DaoUtils.java | 2 +- .../src/main/java/org/sonar/core/persistence/MyBatis.java | 4 ++-- .../CharacteristicsDebtModelSynchronizer.java | 6 +++--- .../CharacteristicsDebtModelXMLImporter.java | 2 +- .../{debt => technicaldebt}/DebtModelPluginRepository.java | 2 +- .../DefaultTechnicalDebtManager.java | 6 +++--- .../{debt => technicaldebt}/DefaultTechnicalDebtModel.java | 2 +- .../{debt => technicaldebt}/RulesDebtModelXMLImporter.java | 2 +- .../TechnicalDebtModelSynchronizer.java | 6 +++--- .../{debt => technicaldebt}/TechnicalDebtRuleCache.java | 2 +- .../{debt => technicaldebt}/TechnicalDebtXMLImporter.java | 4 ++-- .../core/{debt => technicaldebt}/db/CharacteristicDao.java | 2 +- .../core/{debt => technicaldebt}/db/CharacteristicDto.java | 2 +- .../{debt => technicaldebt}/db/CharacteristicMapper.java | 2 +- .../sonar/core/{debt => technicaldebt/db}/package-info.java | 3 ++- .../sonar/core/{debt/db => technicaldebt}/package-info.java | 3 +-- .../{debt => technicaldebt}/db/CharacteristicMapper.xml | 2 +- .../CharacteristicsDebtModelSynchronizerTest.java | 6 +++--- .../CharacteristicsDebtModelXMLImporterTest.java | 2 +- .../DebtModelPluginRepositoryTest.java | 4 ++-- .../DefaultTechnicalDebtManagerTest.java | 6 +++--- .../DefaultTechnicalDebtModelTest.java | 2 +- .../RulesDebtModelXMLImporterTest.java | 2 +- .../TechnicalDebtModelSynchronizerTest.java | 6 +++--- .../{debt => technicaldebt}/TechnicalDebtRuleCacheTest.java | 2 +- .../TechnicalDebtXMLImporterTest.java | 2 +- .../{debt => technicaldebt}/db/CharacteristicDaoTest.java | 2 +- .../{debt => technicaldebt}/db/CharacteristicDtoTest.java | 2 +- .../import_badly_formatted_xml.xml | 0 .../import_characteristics.xml | 0 ...ed_linear_with_threshold_function_by_linear_function.xml | 0 .../ignore_deprecated_constant_per_file_function.xml | 0 .../RulesDebtModelXMLImporterTest/ignore_invalid_value.xml | 0 .../ignore_rule_on_root_characteristics.xml | 0 .../import_badly_formatted_xml.xml | 0 .../RulesDebtModelXMLImporterTest/import_constant_issue.xml | 0 .../RulesDebtModelXMLImporterTest/import_linear.xml | 0 .../import_linear_with_offset.xml | 0 .../RulesDebtModelXMLImporterTest/import_rules.xml | 0 .../RulesDebtModelXMLImporterTest/replace_mn_by_min.xml | 0 .../use_default_unit_when_no_unit.xml | 0 .../TechnicalDebtModelRepositoryTest/csharp-model.xml | 0 .../TechnicalDebtModelRepositoryTest/java-model.xml | 0 .../ignore_requirement_on_root_characteristics.xml | 0 .../TechnicalDebtXMLImporterTest/import_characteristics.xml | 0 .../shouldImportXML_badly-formatted.xml | 0 .../shouldImportXML_with_deprecated_constant_per_file.xml | 0 ...houldImportXML_with_deprecated_linear_with_threshold.xml | 0 .../shouldImportXML_with_linear.xml | 0 .../shouldImportXML_with_linear_with_offset.xml | 0 .../shouldLogWarningIfRuleNotFound.xml | 0 .../shouldRejectXML_with_invalid_value.xml | 0 .../use_default_unit_when_no_unit.xml | 0 .../db/CharacteristicDaoTest/disable-result.xml | 0 .../db/CharacteristicDaoTest/disable.xml | 0 .../CharacteristicDaoTest/insert_characteristic-result.xml | 0 .../db/CharacteristicDaoTest/insert_requirement-result.xml | 0 .../select_enabled_root_characteristics.xml | 0 ...d_root_characteristics_order_by_characteristic_order.xml | 0 .../db/CharacteristicDaoTest/shared.xml | 0 .../CharacteristicDaoTest/update_characteristic-result.xml | 0 .../db/CharacteristicDaoTest/update_characteristic.xml | 0 .../db/CharacteristicDaoTest/update_requirement-result.xml | 0 .../db/CharacteristicDaoTest/update_requirement.xml | 0 .../java/org/sonar/server/issue/ws/IssueShowWsHandler.java | 2 +- .../src/main/java/org/sonar/server/platform/Platform.java | 2 +- .../org/sonar/server/rule/DeprecatedRuleDefinitions.java | 4 ++-- .../main/java/org/sonar/server/rule/RuleRegistration.java | 4 ++-- .../server/startup/RegisterDebtCharacteristicModel.java | 2 +- .../sonar/server/startup/RegisterTechnicalDebtModel.java | 4 ++-- .../java/org/sonar/server/technicaldebt/DebtService.java | 2 +- .../org/sonar/server/issue/ws/IssueShowWsHandlerTest.java | 2 +- .../sonar/server/rule/DeprecatedRuleDefinitionsTest.java | 4 ++-- .../java/org/sonar/server/rule/RuleRegistrationTest.java | 2 +- .../server/startup/RegisterDebtCharacteristicModelTest.java | 2 +- .../server/startup/RegisterTechnicalDebtModelTest.java | 4 ++-- .../org/sonar/server/technicaldebt/DebtServiceTest.java | 2 +- 79 files changed, 68 insertions(+), 68 deletions(-) rename sonar-core/src/main/java/org/sonar/core/{debt => technicaldebt}/CharacteristicsDebtModelSynchronizer.java (96%) rename sonar-core/src/main/java/org/sonar/core/{debt => technicaldebt}/CharacteristicsDebtModelXMLImporter.java (99%) rename sonar-core/src/main/java/org/sonar/core/{debt => technicaldebt}/DebtModelPluginRepository.java (99%) rename sonar-core/src/main/java/org/sonar/core/{debt => technicaldebt}/DefaultTechnicalDebtManager.java (96%) rename sonar-core/src/main/java/org/sonar/core/{debt => technicaldebt}/DefaultTechnicalDebtModel.java (99%) rename sonar-core/src/main/java/org/sonar/core/{debt => technicaldebt}/RulesDebtModelXMLImporter.java (99%) rename sonar-core/src/main/java/org/sonar/core/{debt => technicaldebt}/TechnicalDebtModelSynchronizer.java (98%) rename sonar-core/src/main/java/org/sonar/core/{debt => technicaldebt}/TechnicalDebtRuleCache.java (98%) rename sonar-core/src/main/java/org/sonar/core/{debt => technicaldebt}/TechnicalDebtXMLImporter.java (99%) rename sonar-core/src/main/java/org/sonar/core/{debt => technicaldebt}/db/CharacteristicDao.java (99%) rename sonar-core/src/main/java/org/sonar/core/{debt => technicaldebt}/db/CharacteristicDto.java (99%) rename sonar-core/src/main/java/org/sonar/core/{debt => technicaldebt}/db/CharacteristicMapper.java (97%) rename sonar-core/src/main/java/org/sonar/core/{debt => technicaldebt/db}/package-info.java (95%) rename sonar-core/src/main/java/org/sonar/core/{debt/db => technicaldebt}/package-info.java (96%) rename sonar-core/src/main/resources/org/sonar/core/{debt => technicaldebt}/db/CharacteristicMapper.xml (97%) rename sonar-core/src/test/java/org/sonar/core/{debt => technicaldebt}/CharacteristicsDebtModelSynchronizerTest.java (96%) rename sonar-core/src/test/java/org/sonar/core/{debt => technicaldebt}/CharacteristicsDebtModelXMLImporterTest.java (99%) rename sonar-core/src/test/java/org/sonar/core/{debt => technicaldebt}/DebtModelPluginRepositoryTest.java (98%) rename sonar-core/src/test/java/org/sonar/core/{debt => technicaldebt}/DefaultTechnicalDebtManagerTest.java (97%) rename sonar-core/src/test/java/org/sonar/core/{debt => technicaldebt}/DefaultTechnicalDebtModelTest.java (99%) rename sonar-core/src/test/java/org/sonar/core/{debt => technicaldebt}/RulesDebtModelXMLImporterTest.java (99%) rename sonar-core/src/test/java/org/sonar/core/{debt => technicaldebt}/TechnicalDebtModelSynchronizerTest.java (98%) rename sonar-core/src/test/java/org/sonar/core/{debt => technicaldebt}/TechnicalDebtRuleCacheTest.java (98%) rename sonar-core/src/test/java/org/sonar/core/{debt => technicaldebt}/TechnicalDebtXMLImporterTest.java (99%) rename sonar-core/src/test/java/org/sonar/core/{debt => technicaldebt}/db/CharacteristicDaoTest.java (99%) rename sonar-core/src/test/java/org/sonar/core/{debt => technicaldebt}/db/CharacteristicDtoTest.java (98%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/CharacteristicsDebtModelXMLImporterTest/import_badly_formatted_xml.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/CharacteristicsDebtModelXMLImporterTest/import_characteristics.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/RulesDebtModelXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/RulesDebtModelXMLImporterTest/ignore_deprecated_constant_per_file_function.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/RulesDebtModelXMLImporterTest/ignore_invalid_value.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/RulesDebtModelXMLImporterTest/ignore_rule_on_root_characteristics.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/RulesDebtModelXMLImporterTest/import_badly_formatted_xml.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/RulesDebtModelXMLImporterTest/import_constant_issue.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/RulesDebtModelXMLImporterTest/import_linear.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/RulesDebtModelXMLImporterTest/import_linear_with_offset.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/RulesDebtModelXMLImporterTest/import_rules.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/RulesDebtModelXMLImporterTest/replace_mn_by_min.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/RulesDebtModelXMLImporterTest/use_default_unit_when_no_unit.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/TechnicalDebtModelRepositoryTest/csharp-model.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/TechnicalDebtModelRepositoryTest/java-model.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/TechnicalDebtXMLImporterTest/ignore_requirement_on_root_characteristics.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/TechnicalDebtXMLImporterTest/import_characteristics.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/TechnicalDebtXMLImporterTest/shouldImportXML_badly-formatted.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_constant_per_file.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_linear_with_threshold.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear_with_offset.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/TechnicalDebtXMLImporterTest/shouldRejectXML_with_invalid_value.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/TechnicalDebtXMLImporterTest/use_default_unit_when_no_unit.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/db/CharacteristicDaoTest/disable-result.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/db/CharacteristicDaoTest/disable.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/db/CharacteristicDaoTest/insert_characteristic-result.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/db/CharacteristicDaoTest/insert_requirement-result.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/db/CharacteristicDaoTest/select_enabled_root_characteristics.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/db/CharacteristicDaoTest/select_enabled_root_characteristics_order_by_characteristic_order.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/db/CharacteristicDaoTest/shared.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/db/CharacteristicDaoTest/update_characteristic-result.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/db/CharacteristicDaoTest/update_characteristic.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/db/CharacteristicDaoTest/update_requirement-result.xml (100%) rename sonar-core/src/test/resources/org/sonar/core/{debt => technicaldebt}/db/CharacteristicDaoTest/update_requirement.xml (100%) diff --git a/sonar-batch/src/main/java/org/sonar/batch/debt/DebtModelLoader.java b/sonar-batch/src/main/java/org/sonar/batch/debt/DebtModelLoader.java index 9d770500e3c..1cbf38d6835 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/debt/DebtModelLoader.java +++ b/sonar-batch/src/main/java/org/sonar/batch/debt/DebtModelLoader.java @@ -27,9 +27,9 @@ import org.sonar.api.rules.RuleFinder; import org.sonar.api.rules.RuleQuery; import org.sonar.api.technicaldebt.batch.TechnicalDebtModel; import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic; -import org.sonar.core.debt.DefaultTechnicalDebtModel; -import org.sonar.core.debt.db.CharacteristicDao; -import org.sonar.core.debt.db.CharacteristicDto; +import org.sonar.core.technicaldebt.DefaultTechnicalDebtModel; +import org.sonar.core.technicaldebt.db.CharacteristicDao; +import org.sonar.core.technicaldebt.db.CharacteristicDto; import java.util.Collection; import java.util.List; 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 1d2ce77018f..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 @@ -32,9 +32,9 @@ 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.internal.WorkDuration; -import org.sonar.core.debt.DefaultTechnicalDebtModel; -import org.sonar.core.debt.db.CharacteristicDao; -import org.sonar.core.debt.db.CharacteristicDto; +import org.sonar.core.technicaldebt.DefaultTechnicalDebtModel; +import org.sonar.core.technicaldebt.db.CharacteristicDao; +import org.sonar.core.technicaldebt.db.CharacteristicDto; import static com.google.common.collect.Lists.newArrayList; import static org.fest.assertions.Assertions.assertThat; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DaoUtils.java b/sonar-core/src/main/java/org/sonar/core/persistence/DaoUtils.java index 5beafe71e24..05628a72ed0 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/DaoUtils.java +++ b/sonar-core/src/main/java/org/sonar/core/persistence/DaoUtils.java @@ -22,7 +22,6 @@ package org.sonar.core.persistence; import com.google.common.collect.ImmutableList; import org.sonar.core.dashboard.ActiveDashboardDao; import org.sonar.core.dashboard.DashboardDao; -import org.sonar.core.debt.db.CharacteristicDao; import org.sonar.core.duplication.DuplicationDao; import org.sonar.core.graph.jdbc.GraphDao; import org.sonar.core.issue.db.*; @@ -42,6 +41,7 @@ import org.sonar.core.rule.RuleDao; import org.sonar.core.rule.RuleTagDao; import org.sonar.core.source.db.SnapshotDataDao; import org.sonar.core.source.db.SnapshotSourceDao; +import org.sonar.core.technicaldebt.db.CharacteristicDao; import org.sonar.core.template.LoadedTemplateDao; import org.sonar.core.user.*; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java b/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java index f1fd87442c5..8325bd831cd 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java +++ b/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java @@ -36,8 +36,6 @@ import org.sonar.core.component.ComponentDto; import org.sonar.core.component.db.ComponentMapper; import org.sonar.core.config.Logback; import org.sonar.core.dashboard.*; -import org.sonar.core.debt.db.CharacteristicDto; -import org.sonar.core.debt.db.CharacteristicMapper; import org.sonar.core.dependency.DependencyDto; import org.sonar.core.dependency.DependencyMapper; import org.sonar.core.dependency.ResourceSnapshotDto; @@ -65,6 +63,8 @@ import org.sonar.core.rule.*; import org.sonar.core.source.db.SnapshotDataDto; import org.sonar.core.source.db.SnapshotDataMapper; import org.sonar.core.source.db.SnapshotSourceMapper; +import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.core.technicaldebt.db.CharacteristicMapper; import org.sonar.core.template.LoadedTemplateDto; import org.sonar.core.template.LoadedTemplateMapper; import org.sonar.core.user.*; diff --git a/sonar-core/src/main/java/org/sonar/core/debt/CharacteristicsDebtModelSynchronizer.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelSynchronizer.java similarity index 96% rename from sonar-core/src/main/java/org/sonar/core/debt/CharacteristicsDebtModelSynchronizer.java rename to sonar-core/src/main/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelSynchronizer.java index 6a702d68d23..9ed88aa6004 100644 --- a/sonar-core/src/main/java/org/sonar/core/debt/CharacteristicsDebtModelSynchronizer.java +++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelSynchronizer.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt; +package org.sonar.core.technicaldebt; import org.apache.commons.io.IOUtils; import org.apache.ibatis.session.SqlSession; @@ -27,9 +27,9 @@ import org.slf4j.LoggerFactory; import org.sonar.api.ServerExtension; import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic; import org.sonar.api.utils.ValidationMessages; -import org.sonar.core.debt.db.CharacteristicDao; -import org.sonar.core.debt.db.CharacteristicDto; import org.sonar.core.persistence.MyBatis; +import org.sonar.core.technicaldebt.db.CharacteristicDao; +import org.sonar.core.technicaldebt.db.CharacteristicDto; import java.io.Reader; import java.util.List; diff --git a/sonar-core/src/main/java/org/sonar/core/debt/CharacteristicsDebtModelXMLImporter.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporter.java similarity index 99% rename from sonar-core/src/main/java/org/sonar/core/debt/CharacteristicsDebtModelXMLImporter.java rename to sonar-core/src/main/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporter.java index 343714038ff..384584d0c9e 100644 --- a/sonar-core/src/main/java/org/sonar/core/debt/CharacteristicsDebtModelXMLImporter.java +++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporter.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt; +package org.sonar.core.technicaldebt; import org.apache.commons.lang.StringUtils; import org.codehaus.stax2.XMLInputFactory2; diff --git a/sonar-core/src/main/java/org/sonar/core/debt/DebtModelPluginRepository.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/DebtModelPluginRepository.java similarity index 99% rename from sonar-core/src/main/java/org/sonar/core/debt/DebtModelPluginRepository.java rename to sonar-core/src/main/java/org/sonar/core/technicaldebt/DebtModelPluginRepository.java index ca4de29cabe..d6bf39e74f3 100644 --- a/sonar-core/src/main/java/org/sonar/core/debt/DebtModelPluginRepository.java +++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/DebtModelPluginRepository.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt; +package org.sonar.core.technicaldebt; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Maps; diff --git a/sonar-core/src/main/java/org/sonar/core/debt/DefaultTechnicalDebtManager.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtManager.java similarity index 96% rename from sonar-core/src/main/java/org/sonar/core/debt/DefaultTechnicalDebtManager.java rename to sonar-core/src/main/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtManager.java index eb9fe925ef2..823064f6204 100644 --- a/sonar-core/src/main/java/org/sonar/core/debt/DefaultTechnicalDebtManager.java +++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtManager.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt; +package org.sonar.core.technicaldebt; import org.sonar.api.rule.RuleKey; @@ -27,8 +27,8 @@ import org.sonar.api.rules.RuleFinder; import org.sonar.api.technicaldebt.server.Characteristic; import org.sonar.api.technicaldebt.server.TechnicalDebtManager; import org.sonar.api.technicaldebt.server.internal.DefaultCharacteristic; -import org.sonar.core.debt.db.CharacteristicDao; -import org.sonar.core.debt.db.CharacteristicDto; +import org.sonar.core.technicaldebt.db.CharacteristicDao; +import org.sonar.core.technicaldebt.db.CharacteristicDto; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/sonar-core/src/main/java/org/sonar/core/debt/DefaultTechnicalDebtModel.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtModel.java similarity index 99% rename from sonar-core/src/main/java/org/sonar/core/debt/DefaultTechnicalDebtModel.java rename to sonar-core/src/main/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtModel.java index 4cb950dc926..6c9c50d55e4 100644 --- a/sonar-core/src/main/java/org/sonar/core/debt/DefaultTechnicalDebtModel.java +++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtModel.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt; +package org.sonar.core.technicaldebt; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; diff --git a/sonar-core/src/main/java/org/sonar/core/debt/RulesDebtModelXMLImporter.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/RulesDebtModelXMLImporter.java similarity index 99% rename from sonar-core/src/main/java/org/sonar/core/debt/RulesDebtModelXMLImporter.java rename to sonar-core/src/main/java/org/sonar/core/technicaldebt/RulesDebtModelXMLImporter.java index 927e3753ff1..20ab3c0f3c6 100644 --- a/sonar-core/src/main/java/org/sonar/core/debt/RulesDebtModelXMLImporter.java +++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/RulesDebtModelXMLImporter.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt; +package org.sonar.core.technicaldebt; import com.google.common.base.Predicate; import com.google.common.base.Strings; diff --git a/sonar-core/src/main/java/org/sonar/core/debt/TechnicalDebtModelSynchronizer.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtModelSynchronizer.java similarity index 98% rename from sonar-core/src/main/java/org/sonar/core/debt/TechnicalDebtModelSynchronizer.java rename to sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtModelSynchronizer.java index f5703a43f71..fef9f7b23cd 100644 --- a/sonar-core/src/main/java/org/sonar/core/debt/TechnicalDebtModelSynchronizer.java +++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtModelSynchronizer.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt; +package org.sonar.core.technicaldebt; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; @@ -31,9 +31,9 @@ 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.core.debt.db.CharacteristicDao; -import org.sonar.core.debt.db.CharacteristicDto; import org.sonar.core.persistence.MyBatis; +import org.sonar.core.technicaldebt.db.CharacteristicDao; +import org.sonar.core.technicaldebt.db.CharacteristicDto; import javax.annotation.CheckForNull; diff --git a/sonar-core/src/main/java/org/sonar/core/debt/TechnicalDebtRuleCache.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtRuleCache.java similarity index 98% rename from sonar-core/src/main/java/org/sonar/core/debt/TechnicalDebtRuleCache.java rename to sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtRuleCache.java index 92b1f07a6f4..d5a098a2e45 100644 --- a/sonar-core/src/main/java/org/sonar/core/debt/TechnicalDebtRuleCache.java +++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtRuleCache.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt; +package org.sonar.core.technicaldebt; import com.google.common.collect.Maps; import org.sonar.api.rule.RuleKey; diff --git a/sonar-core/src/main/java/org/sonar/core/debt/TechnicalDebtXMLImporter.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporter.java similarity index 99% rename from sonar-core/src/main/java/org/sonar/core/debt/TechnicalDebtXMLImporter.java rename to sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporter.java index 6c46bf9fda0..12c307dd004 100644 --- a/sonar-core/src/main/java/org/sonar/core/debt/TechnicalDebtXMLImporter.java +++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporter.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt; +package org.sonar.core.technicaldebt; import com.google.common.base.Predicate; import com.google.common.base.Strings; @@ -38,7 +38,7 @@ 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.internal.WorkDuration; -import org.sonar.core.debt.db.CharacteristicDto; +import org.sonar.core.technicaldebt.db.CharacteristicDto; import javax.annotation.CheckForNull; import javax.xml.stream.XMLInputFactory; diff --git a/sonar-core/src/main/java/org/sonar/core/debt/db/CharacteristicDao.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDao.java similarity index 99% rename from sonar-core/src/main/java/org/sonar/core/debt/db/CharacteristicDao.java rename to sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDao.java index 923287699cc..6e6ff49879a 100644 --- a/sonar-core/src/main/java/org/sonar/core/debt/db/CharacteristicDao.java +++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDao.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt.db; +package org.sonar.core.technicaldebt.db; import org.apache.ibatis.session.SqlSession; import org.sonar.api.BatchComponent; diff --git a/sonar-core/src/main/java/org/sonar/core/debt/db/CharacteristicDto.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDto.java similarity index 99% rename from sonar-core/src/main/java/org/sonar/core/debt/db/CharacteristicDto.java rename to sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDto.java index 23eb8a252fd..18a1bb9034d 100644 --- a/sonar-core/src/main/java/org/sonar/core/debt/db/CharacteristicDto.java +++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDto.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt.db; +package org.sonar.core.technicaldebt.db; import org.sonar.api.rule.RuleKey; import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic; diff --git a/sonar-core/src/main/java/org/sonar/core/debt/db/CharacteristicMapper.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicMapper.java similarity index 97% rename from sonar-core/src/main/java/org/sonar/core/debt/db/CharacteristicMapper.java rename to sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicMapper.java index 1e5243b4be0..7ab1b291874 100644 --- a/sonar-core/src/main/java/org/sonar/core/debt/db/CharacteristicMapper.java +++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicMapper.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt.db; +package org.sonar.core.technicaldebt.db; import java.util.List; diff --git a/sonar-core/src/main/java/org/sonar/core/debt/package-info.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/package-info.java similarity index 95% rename from sonar-core/src/main/java/org/sonar/core/debt/package-info.java rename to sonar-core/src/main/java/org/sonar/core/technicaldebt/db/package-info.java index 46a651d70ec..815db165b0b 100644 --- a/sonar-core/src/main/java/org/sonar/core/debt/package-info.java +++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/package-info.java @@ -17,7 +17,8 @@ * 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.core.debt; +package org.sonar.core.technicaldebt.db; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/debt/db/package-info.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/package-info.java similarity index 96% rename from sonar-core/src/main/java/org/sonar/core/debt/db/package-info.java rename to sonar-core/src/main/java/org/sonar/core/technicaldebt/package-info.java index b003c97e676..268f4dbbc54 100644 --- a/sonar-core/src/main/java/org/sonar/core/debt/db/package-info.java +++ b/sonar-core/src/main/java/org/sonar/core/technicaldebt/package-info.java @@ -17,8 +17,7 @@ * 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.core.debt.db; +package org.sonar.core.technicaldebt; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/resources/org/sonar/core/debt/db/CharacteristicMapper.xml b/sonar-core/src/main/resources/org/sonar/core/technicaldebt/db/CharacteristicMapper.xml similarity index 97% rename from sonar-core/src/main/resources/org/sonar/core/debt/db/CharacteristicMapper.xml rename to sonar-core/src/main/resources/org/sonar/core/technicaldebt/db/CharacteristicMapper.xml index ff16da14c8b..2988115ae16 100644 --- a/sonar-core/src/main/resources/org/sonar/core/debt/db/CharacteristicMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/technicaldebt/db/CharacteristicMapper.xml @@ -2,7 +2,7 @@ - + c.id, diff --git a/sonar-core/src/test/java/org/sonar/core/debt/CharacteristicsDebtModelSynchronizerTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelSynchronizerTest.java similarity index 96% rename from sonar-core/src/test/java/org/sonar/core/debt/CharacteristicsDebtModelSynchronizerTest.java rename to sonar-core/src/test/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelSynchronizerTest.java index 4030cc8c3c5..814e12fa54f 100644 --- a/sonar-core/src/test/java/org/sonar/core/debt/CharacteristicsDebtModelSynchronizerTest.java +++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelSynchronizerTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt; +package org.sonar.core.technicaldebt; import com.google.common.collect.Lists; import org.apache.ibatis.session.SqlSession; @@ -32,9 +32,9 @@ import org.mockito.runners.MockitoJUnitRunner; import org.mockito.stubbing.Answer; import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic; import org.sonar.api.utils.ValidationMessages; -import org.sonar.core.debt.db.CharacteristicDao; -import org.sonar.core.debt.db.CharacteristicDto; import org.sonar.core.persistence.MyBatis; +import org.sonar.core.technicaldebt.db.CharacteristicDao; +import org.sonar.core.technicaldebt.db.CharacteristicDto; import java.io.Reader; import java.util.Collections; diff --git a/sonar-core/src/test/java/org/sonar/core/debt/CharacteristicsDebtModelXMLImporterTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporterTest.java similarity index 99% rename from sonar-core/src/test/java/org/sonar/core/debt/CharacteristicsDebtModelXMLImporterTest.java rename to sonar-core/src/test/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporterTest.java index c68f4ace3d5..ef655066c4b 100644 --- a/sonar-core/src/test/java/org/sonar/core/debt/CharacteristicsDebtModelXMLImporterTest.java +++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporterTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt; +package org.sonar.core.technicaldebt; import com.google.common.base.Charsets; import com.google.common.io.Resources; diff --git a/sonar-core/src/test/java/org/sonar/core/debt/DebtModelPluginRepositoryTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/DebtModelPluginRepositoryTest.java similarity index 98% rename from sonar-core/src/test/java/org/sonar/core/debt/DebtModelPluginRepositoryTest.java rename to sonar-core/src/test/java/org/sonar/core/technicaldebt/DebtModelPluginRepositoryTest.java index 9e8d7c953c4..822c4682419 100644 --- a/sonar-core/src/test/java/org/sonar/core/debt/DebtModelPluginRepositoryTest.java +++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/DebtModelPluginRepositoryTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt; +package org.sonar.core.technicaldebt; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -48,7 +48,7 @@ import static org.mockito.Mockito.when; public class DebtModelPluginRepositoryTest { - private static final String TEST_XML_PREFIX_PATH = "org/sonar/core/debt/TechnicalDebtModelRepositoryTest/"; + private static final String TEST_XML_PREFIX_PATH = "org/sonar/core/technicaldebt/TechnicalDebtModelRepositoryTest/"; private DebtModelPluginRepository modelFinder; diff --git a/sonar-core/src/test/java/org/sonar/core/debt/DefaultTechnicalDebtManagerTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtManagerTest.java similarity index 97% rename from sonar-core/src/test/java/org/sonar/core/debt/DefaultTechnicalDebtManagerTest.java rename to sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtManagerTest.java index ef7001eadf5..9095488504c 100644 --- a/sonar-core/src/test/java/org/sonar/core/debt/DefaultTechnicalDebtManagerTest.java +++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtManagerTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt; +package org.sonar.core.technicaldebt; import org.junit.Before; import org.junit.Test; @@ -30,8 +30,8 @@ import org.sonar.api.rules.Rule; import org.sonar.api.rules.RuleFinder; import org.sonar.api.technicaldebt.server.Characteristic; import org.sonar.api.utils.internal.WorkDuration; -import org.sonar.core.debt.db.CharacteristicDao; -import org.sonar.core.debt.db.CharacteristicDto; +import org.sonar.core.technicaldebt.db.CharacteristicDao; +import org.sonar.core.technicaldebt.db.CharacteristicDto; import java.util.List; diff --git a/sonar-core/src/test/java/org/sonar/core/debt/DefaultTechnicalDebtModelTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtModelTest.java similarity index 99% rename from sonar-core/src/test/java/org/sonar/core/debt/DefaultTechnicalDebtModelTest.java rename to sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtModelTest.java index a3c9dd745b8..ef857e167d1 100644 --- a/sonar-core/src/test/java/org/sonar/core/debt/DefaultTechnicalDebtModelTest.java +++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/DefaultTechnicalDebtModelTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt; +package org.sonar.core.technicaldebt; import org.junit.Before; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/debt/RulesDebtModelXMLImporterTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest.java similarity index 99% rename from sonar-core/src/test/java/org/sonar/core/debt/RulesDebtModelXMLImporterTest.java rename to sonar-core/src/test/java/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest.java index 8caa1a4c127..64865e9dc5b 100644 --- a/sonar-core/src/test/java/org/sonar/core/debt/RulesDebtModelXMLImporterTest.java +++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt; +package org.sonar.core.technicaldebt; import com.google.common.base.Charsets; import com.google.common.io.Resources; diff --git a/sonar-core/src/test/java/org/sonar/core/debt/TechnicalDebtModelSynchronizerTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtModelSynchronizerTest.java similarity index 98% rename from sonar-core/src/test/java/org/sonar/core/debt/TechnicalDebtModelSynchronizerTest.java rename to sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtModelSynchronizerTest.java index 0244c420646..b49190b6f2f 100644 --- a/sonar-core/src/test/java/org/sonar/core/debt/TechnicalDebtModelSynchronizerTest.java +++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtModelSynchronizerTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt; +package org.sonar.core.technicaldebt; import com.google.common.collect.Lists; import org.apache.ibatis.session.SqlSession; @@ -36,9 +36,9 @@ 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.internal.WorkDuration; -import org.sonar.core.debt.db.CharacteristicDao; -import org.sonar.core.debt.db.CharacteristicDto; import org.sonar.core.persistence.MyBatis; +import org.sonar.core.technicaldebt.db.CharacteristicDao; +import org.sonar.core.technicaldebt.db.CharacteristicDto; import java.io.Reader; import java.util.Collections; diff --git a/sonar-core/src/test/java/org/sonar/core/debt/TechnicalDebtRuleCacheTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtRuleCacheTest.java similarity index 98% rename from sonar-core/src/test/java/org/sonar/core/debt/TechnicalDebtRuleCacheTest.java rename to sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtRuleCacheTest.java index 0cb884e894d..7185f7910c1 100644 --- a/sonar-core/src/test/java/org/sonar/core/debt/TechnicalDebtRuleCacheTest.java +++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtRuleCacheTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt; +package org.sonar.core.technicaldebt; import com.google.common.collect.Lists; import org.fest.assertions.Assertions; diff --git a/sonar-core/src/test/java/org/sonar/core/debt/TechnicalDebtXMLImporterTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest.java similarity index 99% rename from sonar-core/src/test/java/org/sonar/core/debt/TechnicalDebtXMLImporterTest.java rename to sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest.java index ad7f8d0b808..64c5dea9492 100644 --- a/sonar-core/src/test/java/org/sonar/core/debt/TechnicalDebtXMLImporterTest.java +++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt; +package org.sonar.core.technicaldebt; import com.google.common.base.Charsets; import com.google.common.collect.Lists; diff --git a/sonar-core/src/test/java/org/sonar/core/debt/db/CharacteristicDaoTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDaoTest.java similarity index 99% rename from sonar-core/src/test/java/org/sonar/core/debt/db/CharacteristicDaoTest.java rename to sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDaoTest.java index 928f8de3c55..0e4341ab81c 100644 --- a/sonar-core/src/test/java/org/sonar/core/debt/db/CharacteristicDaoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDaoTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt.db; +package org.sonar.core.technicaldebt.db; import org.junit.Before; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/debt/db/CharacteristicDtoTest.java b/sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDtoTest.java similarity index 98% rename from sonar-core/src/test/java/org/sonar/core/debt/db/CharacteristicDtoTest.java rename to sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDtoTest.java index 7867f132795..f6730185360 100644 --- a/sonar-core/src/test/java/org/sonar/core/debt/db/CharacteristicDtoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDtoTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.debt.db; +package org.sonar.core.technicaldebt.db; import org.junit.Test; import org.sonar.api.rule.RuleKey; diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/CharacteristicsDebtModelXMLImporterTest/import_badly_formatted_xml.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporterTest/import_badly_formatted_xml.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/CharacteristicsDebtModelXMLImporterTest/import_badly_formatted_xml.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporterTest/import_badly_formatted_xml.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/CharacteristicsDebtModelXMLImporterTest/import_characteristics.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporterTest/import_characteristics.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/CharacteristicsDebtModelXMLImporterTest/import_characteristics.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/CharacteristicsDebtModelXMLImporterTest/import_characteristics.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/ignore_deprecated_constant_per_file_function.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/ignore_deprecated_constant_per_file_function.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/ignore_deprecated_constant_per_file_function.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/ignore_deprecated_constant_per_file_function.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/ignore_invalid_value.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/ignore_invalid_value.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/ignore_invalid_value.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/ignore_invalid_value.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/ignore_rule_on_root_characteristics.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/ignore_rule_on_root_characteristics.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/ignore_rule_on_root_characteristics.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/ignore_rule_on_root_characteristics.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_badly_formatted_xml.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_badly_formatted_xml.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_badly_formatted_xml.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_badly_formatted_xml.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_constant_issue.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_constant_issue.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_constant_issue.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_constant_issue.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_linear.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_linear.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_linear.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_linear.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_linear_with_offset.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_linear_with_offset.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_linear_with_offset.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_linear_with_offset.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_rules.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_rules.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/import_rules.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/import_rules.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/replace_mn_by_min.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/replace_mn_by_min.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/replace_mn_by_min.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/replace_mn_by_min.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/use_default_unit_when_no_unit.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/use_default_unit_when_no_unit.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/RulesDebtModelXMLImporterTest/use_default_unit_when_no_unit.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/RulesDebtModelXMLImporterTest/use_default_unit_when_no_unit.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtModelRepositoryTest/csharp-model.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtModelRepositoryTest/csharp-model.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtModelRepositoryTest/csharp-model.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtModelRepositoryTest/csharp-model.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtModelRepositoryTest/java-model.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtModelRepositoryTest/java-model.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtModelRepositoryTest/java-model.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtModelRepositoryTest/java-model.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/ignore_requirement_on_root_characteristics.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/ignore_requirement_on_root_characteristics.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/ignore_requirement_on_root_characteristics.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/ignore_requirement_on_root_characteristics.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/import_characteristics.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/import_characteristics.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/import_characteristics.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/import_characteristics.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_badly-formatted.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_badly-formatted.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_badly-formatted.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_badly-formatted.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_constant_per_file.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_constant_per_file.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_constant_per_file.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_constant_per_file.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_linear_with_threshold.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_linear_with_threshold.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_linear_with_threshold.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_linear_with_threshold.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear_with_offset.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear_with_offset.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear_with_offset.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear_with_offset.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldRejectXML_with_invalid_value.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldRejectXML_with_invalid_value.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/shouldRejectXML_with_invalid_value.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldRejectXML_with_invalid_value.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/use_default_unit_when_no_unit.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/use_default_unit_when_no_unit.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/TechnicalDebtXMLImporterTest/use_default_unit_when_no_unit.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/use_default_unit_when_no_unit.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/disable-result.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/disable-result.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/disable-result.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/disable-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/disable.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/disable.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/disable.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/disable.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/insert_characteristic-result.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/insert_characteristic-result.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/insert_characteristic-result.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/insert_characteristic-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/insert_requirement-result.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/insert_requirement-result.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/insert_requirement-result.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/insert_requirement-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/select_enabled_root_characteristics.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/select_enabled_root_characteristics.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/select_enabled_root_characteristics.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/select_enabled_root_characteristics.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/select_enabled_root_characteristics_order_by_characteristic_order.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/select_enabled_root_characteristics_order_by_characteristic_order.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/select_enabled_root_characteristics_order_by_characteristic_order.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/select_enabled_root_characteristics_order_by_characteristic_order.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/shared.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/shared.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/shared.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/update_characteristic-result.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_characteristic-result.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/update_characteristic-result.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_characteristic-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/update_characteristic.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_characteristic.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/update_characteristic.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_characteristic.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/update_requirement-result.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_requirement-result.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/update_requirement-result.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_requirement-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/update_requirement.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_requirement.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/debt/db/CharacteristicDaoTest/update_requirement.xml rename to sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_requirement.xml diff --git a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowWsHandler.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowWsHandler.java index 60b571fe4b3..3a78d88179f 100644 --- a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowWsHandler.java +++ b/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowWsHandler.java @@ -38,8 +38,8 @@ import org.sonar.api.utils.Durations; import org.sonar.api.utils.text.JsonWriter; import org.sonar.api.web.UserRole; import org.sonar.core.component.ComponentDto; -import org.sonar.core.debt.DefaultTechnicalDebtManager; import org.sonar.core.issue.workflow.Transition; +import org.sonar.core.technicaldebt.DefaultTechnicalDebtManager; import org.sonar.markdown.Markdown; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.issue.ActionService; 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 ba01ebe9653..fbd8d8aad29 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 @@ -40,7 +40,6 @@ import org.sonar.api.utils.internal.TempFolderCleaner; import org.sonar.core.component.SnapshotPerspectives; import org.sonar.core.component.db.ComponentDao; import org.sonar.core.config.Logback; -import org.sonar.core.debt.*; import org.sonar.core.i18n.DefaultI18n; import org.sonar.core.i18n.GwtI18n; import org.sonar.core.i18n.RuleI18nManager; @@ -64,6 +63,7 @@ import org.sonar.core.qualitygate.db.QualityGateConditionDao; import org.sonar.core.qualitygate.db.QualityGateDao; import org.sonar.core.resource.DefaultResourcePermissions; import org.sonar.core.rule.DefaultRuleFinder; +import org.sonar.core.technicaldebt.*; import org.sonar.core.test.TestPlanPerspectiveLoader; import org.sonar.core.test.TestablePerspectiveLoader; import org.sonar.core.timemachine.Periods; diff --git a/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRuleDefinitions.java b/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRuleDefinitions.java index 6dd2f58a861..19e65fbe32d 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRuleDefinitions.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRuleDefinitions.java @@ -30,9 +30,9 @@ import org.sonar.api.rules.RuleRepository; import org.sonar.api.server.rule.RuleDefinitions; import org.sonar.api.server.rule.RuleParamType; import org.sonar.check.Cardinality; -import org.sonar.core.debt.DebtModelPluginRepository; -import org.sonar.core.debt.RulesDebtModelXMLImporter; import org.sonar.core.i18n.RuleI18nManager; +import org.sonar.core.technicaldebt.DebtModelPluginRepository; +import org.sonar.core.technicaldebt.RulesDebtModelXMLImporter; import javax.annotation.CheckForNull; diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java index 711f7e8a9c4..7e66966c775 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java @@ -36,11 +36,11 @@ import org.sonar.api.utils.MessageException; import org.sonar.api.utils.System2; import org.sonar.api.utils.TimeProfiler; import org.sonar.check.Cardinality; -import org.sonar.core.debt.db.CharacteristicDao; -import org.sonar.core.debt.db.CharacteristicDto; import org.sonar.core.persistence.MyBatis; import org.sonar.core.qualityprofile.db.ActiveRuleDao; import org.sonar.core.rule.*; +import org.sonar.core.technicaldebt.db.CharacteristicDao; +import org.sonar.core.technicaldebt.db.CharacteristicDto; import org.sonar.server.qualityprofile.ProfilesManager; import org.sonar.server.startup.RegisterDebtCharacteristicModel; diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RegisterDebtCharacteristicModel.java b/sonar-server/src/main/java/org/sonar/server/startup/RegisterDebtCharacteristicModel.java index b11a2690ece..7f83c8d8968 100644 --- a/sonar-server/src/main/java/org/sonar/server/startup/RegisterDebtCharacteristicModel.java +++ b/sonar-server/src/main/java/org/sonar/server/startup/RegisterDebtCharacteristicModel.java @@ -24,7 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.utils.TimeProfiler; import org.sonar.api.utils.ValidationMessages; -import org.sonar.core.debt.CharacteristicsDebtModelSynchronizer; +import org.sonar.core.technicaldebt.CharacteristicsDebtModelSynchronizer; public class RegisterDebtCharacteristicModel { diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RegisterTechnicalDebtModel.java b/sonar-server/src/main/java/org/sonar/server/startup/RegisterTechnicalDebtModel.java index 47fa4048d92..4d84d6e446a 100644 --- a/sonar-server/src/main/java/org/sonar/server/startup/RegisterTechnicalDebtModel.java +++ b/sonar-server/src/main/java/org/sonar/server/startup/RegisterTechnicalDebtModel.java @@ -24,8 +24,8 @@ import org.slf4j.LoggerFactory; import org.sonar.api.rules.RuleFinder; import org.sonar.api.utils.TimeProfiler; import org.sonar.api.utils.ValidationMessages; -import org.sonar.core.debt.TechnicalDebtModelSynchronizer; -import org.sonar.core.debt.TechnicalDebtRuleCache; +import org.sonar.core.technicaldebt.TechnicalDebtModelSynchronizer; +import org.sonar.core.technicaldebt.TechnicalDebtRuleCache; import org.sonar.server.rule.RuleRegistration; public final class RegisterTechnicalDebtModel { 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 9ea942bbd36..55b2cb52a4f 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,7 +22,7 @@ package org.sonar.server.technicaldebt; import org.sonar.api.ServerComponent; import org.sonar.api.technicaldebt.server.Characteristic; -import org.sonar.core.debt.DefaultTechnicalDebtManager; +import org.sonar.core.technicaldebt.DefaultTechnicalDebtManager; import javax.annotation.CheckForNull; diff --git a/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowWsHandlerTest.java b/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowWsHandlerTest.java index 345ffaef458..5d9c8edeb54 100644 --- a/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowWsHandlerTest.java +++ b/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowWsHandlerTest.java @@ -46,10 +46,10 @@ import org.sonar.api.utils.Duration; import org.sonar.api.utils.Durations; import org.sonar.api.web.UserRole; import org.sonar.core.component.ComponentDto; -import org.sonar.core.debt.DefaultTechnicalDebtManager; import org.sonar.core.issue.DefaultActionPlan; import org.sonar.core.issue.DefaultIssueQueryResult; import org.sonar.core.issue.workflow.Transition; +import org.sonar.core.technicaldebt.DefaultTechnicalDebtManager; import org.sonar.core.user.DefaultUser; import org.sonar.server.issue.ActionService; import org.sonar.server.issue.IssueChangelog; diff --git a/sonar-server/src/test/java/org/sonar/server/rule/DeprecatedRuleDefinitionsTest.java b/sonar-server/src/test/java/org/sonar/server/rule/DeprecatedRuleDefinitionsTest.java index 72637b17c75..b5002bb6cc1 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule/DeprecatedRuleDefinitionsTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/DeprecatedRuleDefinitionsTest.java @@ -31,9 +31,9 @@ import org.sonar.api.rules.Rule; import org.sonar.api.rules.RulePriority; import org.sonar.api.rules.RuleRepository; import org.sonar.api.server.rule.RuleDefinitions; -import org.sonar.core.debt.DebtModelPluginRepository; -import org.sonar.core.debt.RulesDebtModelXMLImporter; import org.sonar.core.i18n.RuleI18nManager; +import org.sonar.core.technicaldebt.DebtModelPluginRepository; +import org.sonar.core.technicaldebt.RulesDebtModelXMLImporter; import java.io.Reader; import java.util.Arrays; diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistrationTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistrationTest.java index ead303577bd..ff27a710c24 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistrationTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistrationTest.java @@ -27,12 +27,12 @@ import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; import org.sonar.api.server.rule.RuleDefinitions; import org.sonar.api.utils.MessageException; -import org.sonar.core.debt.db.CharacteristicDao; import org.sonar.core.persistence.AbstractDaoTestCase; import org.sonar.core.persistence.MyBatis; import org.sonar.core.qualityprofile.db.ActiveRuleDao; import org.sonar.core.rule.RuleDao; import org.sonar.core.rule.RuleTagDao; +import org.sonar.core.technicaldebt.db.CharacteristicDao; import org.sonar.server.qualityprofile.ProfilesManager; import org.sonar.server.startup.RegisterDebtCharacteristicModel; diff --git a/sonar-server/src/test/java/org/sonar/server/startup/RegisterDebtCharacteristicModelTest.java b/sonar-server/src/test/java/org/sonar/server/startup/RegisterDebtCharacteristicModelTest.java index d01a6470d00..72f6872fe1e 100644 --- a/sonar-server/src/test/java/org/sonar/server/startup/RegisterDebtCharacteristicModelTest.java +++ b/sonar-server/src/test/java/org/sonar/server/startup/RegisterDebtCharacteristicModelTest.java @@ -22,7 +22,7 @@ package org.sonar.server.startup; import org.junit.Test; import org.sonar.api.utils.ValidationMessages; -import org.sonar.core.debt.CharacteristicsDebtModelSynchronizer; +import org.sonar.core.technicaldebt.CharacteristicsDebtModelSynchronizer; import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; diff --git a/sonar-server/src/test/java/org/sonar/server/startup/RegisterTechnicalDebtModelTest.java b/sonar-server/src/test/java/org/sonar/server/startup/RegisterTechnicalDebtModelTest.java index 017e7d5d1df..1e3fcf55f91 100644 --- a/sonar-server/src/test/java/org/sonar/server/startup/RegisterTechnicalDebtModelTest.java +++ b/sonar-server/src/test/java/org/sonar/server/startup/RegisterTechnicalDebtModelTest.java @@ -22,8 +22,8 @@ package org.sonar.server.startup; import org.junit.Test; import org.sonar.api.rules.RuleFinder; import org.sonar.api.utils.ValidationMessages; -import org.sonar.core.debt.TechnicalDebtModelSynchronizer; -import org.sonar.core.debt.TechnicalDebtRuleCache; +import org.sonar.core.technicaldebt.TechnicalDebtModelSynchronizer; +import org.sonar.core.technicaldebt.TechnicalDebtRuleCache; import static org.mockito.Matchers.any; import static org.mockito.Mockito.*; 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 bbddd8ed334..b66fc6c26f5 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 @@ -23,7 +23,7 @@ import org.junit.Before; import org.junit.Test; import org.sonar.api.technicaldebt.server.Characteristic; import org.sonar.api.technicaldebt.server.internal.DefaultCharacteristic; -import org.sonar.core.debt.DefaultTechnicalDebtManager; +import org.sonar.core.technicaldebt.DefaultTechnicalDebtManager; import java.util.List; -- 2.39.5