SONAR-5056 Rename restore() by reset() and delete restore from language feature

diff --git a/sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java b/sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java
index b52a8062a47c6323beb4b9857c2154efe708e41b..4cbe40bfdb76fe1feee40ae2d01c0209ae846d96 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java
+++ b/sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java
@@ -130,27 +130,20 @@ public class DebtModelBackup implements ServerComponent {
   }
 
   /**
-   * Restore from provided model
+   * Reset from provided model
    */
-  public void restore() {
-    restoreProvidedModel(null);
+  public void reset() {
+    restoreProvidedModel();
   }
 
-  /**
-   * Restore from plugins providing rules for a given language
-   */
-  public void restore(final String languageKey) {
-    restoreProvidedModel(languageKey);
-  }
-
-  private void restoreProvidedModel(@Nullable String languageKey) {
+  private void restoreProvidedModel() {
     checkPermission();
 
     Date updateDate = new Date(system2.now());
     SqlSession session = mybatis.openSession();
     try {
-      restoreCharacteristics(loadModelFromPlugin(DebtModelPluginRepository.DEFAULT_MODEL), languageKey == null, updateDate, session);
-      List<RuleDto> ruleDtos = rules(languageKey, session);
+      restoreCharacteristics(loadModelFromPlugin(DebtModelPluginRepository.DEFAULT_MODEL), true, updateDate, session);
+      List<RuleDto> ruleDtos = rules(null, session);
       for (RuleDto rule : ruleDtos) {
         rule.setSubCharacteristicId(null);
         rule.setRemediationFunction(null);

diff --git a/sonar-server/src/main/java/org/sonar/server/debt/DebtModelService.java b/sonar-server/src/main/java/org/sonar/server/debt/DebtModelService.java
index 4a06db092849d84ba9ff9c93d1fe2c30222ead55..a3c85737a0b55328eb844269a0d605578462337c 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/debt/DebtModelService.java
+++ b/sonar-server/src/main/java/org/sonar/server/debt/DebtModelService.java
@@ -85,17 +85,10 @@ public class DebtModelService implements DebtModel {
   }
 
   /**
-   * Restore from provided model
+   * Reset model
    */
-  public void restore() {
-    debtModelBackup.restore();
-  }
-
-  /**
-   * Restore from plugins providing rules for a given language
-   */
-  public void restoreFromLanguage(String languageKey) {
-    debtModelBackup.restore(languageKey);
+  public void reset() {
+    debtModelBackup.reset();
   }
 
   /**

diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RegisterDebtModel.java b/sonar-server/src/main/java/org/sonar/server/startup/RegisterDebtModel.java
index f482fe1117c5daf25f481862cd9a0514c18e0332..e922638a83150f34d93e3fc14cdd453b9d4066b6 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/startup/RegisterDebtModel.java
+++ b/sonar-server/src/main/java/org/sonar/server/startup/RegisterDebtModel.java
@@ -41,7 +41,7 @@ public class RegisterDebtModel {
   public void start() {
     TimeProfiler profiler = new TimeProfiler(LOGGER).start("Register technical debt model");
     if (dao.selectEnabledCharacteristics().isEmpty()) {
-      debtModelBackup.restore();
+      debtModelBackup.reset();
     }
     profiler.stop();
   }

diff --git a/sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java b/sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java
index cab7dab8aa16fdd9946945dc41ce3f0ea15e134c..f6b76645cfb62ebe61984263811aa8f54b1c1abc 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java
@@ -319,7 +319,7 @@ public class DebtModelBackupTest {
   }
 
   @Test
-  public void restore_from_provided_model() throws Exception {
+  public void reset_from_provided_model() throws Exception {
     when(characteristicsXMLImporter.importXML(any(Reader.class))).thenReturn(new DebtModel()
       .addRootCharacteristic(new DefaultDebtCharacteristic().setKey("PORTABILITY").setName("Portability").setOrder(1))
       .addSubCharacteristic(new DefaultDebtCharacteristic().setKey("COMPILER").setName("Compiler"), "PORTABILITY"));
@@ -334,7 +334,7 @@ public class DebtModelBackupTest {
         .setCreatedAt(oldDate).setUpdatedAt(oldDate)
     ));
 
-    debtModelBackup.restore();
+    debtModelBackup.reset();
 
     verify(dao).selectEnabledCharacteristics(session);
     verify(dao, times(2)).update(any(CharacteristicDto.class), eq(session));
@@ -355,56 +355,6 @@ public class DebtModelBackupTest {
     assertThat(rule.getUpdatedAt()).isEqualTo(now);
   }
 
-  @Test
-  public void restore_from_language() throws Exception {
-    when(characteristicsXMLImporter.importXML(any(Reader.class))).thenReturn(new DebtModel());
-
-    when(ruleDao.selectEnablesAndNonManual(session)).thenReturn(newArrayList(
-      new RuleDto().setId(1).setRepositoryKey("squid").setLanguage("java")
-        .setSubCharacteristicId(2).setRemediationFunction("LINEAR_OFFSET").setRemediationCoefficient("2h").setRemediationOffset("15min")
-        .setCreatedAt(oldDate).setUpdatedAt(oldDate),
-      // Should be ignored because linked on another language
-      new RuleDto().setId(2).setRepositoryKey("checkstyle").setLanguage("java2")
-        .setSubCharacteristicId(2).setRemediationFunction("LINEAR").setRemediationCoefficient("2h")
-        .setCreatedAt(oldDate).setUpdatedAt(oldDate)
-    ));
-
-    debtModelBackup.restore("java");
-
-    verify(dao, never()).update(any(CharacteristicDto.class), eq(session));
-
-    verify(ruleDao).selectEnablesAndNonManual(session);
-    verify(ruleDao).update(ruleCaptor.capture(), eq(session));
-    verifyNoMoreInteractions(ruleDao);
-    verify(ruleRegistry).reindex(ruleCaptor.getAllValues(), session);
-    verify(session).commit();
-
-    RuleDto rule = ruleCaptor.getValue();
-    assertThat(rule.getId()).isEqualTo(1);
-    assertThat(rule.getSubCharacteristicId()).isNull();
-    assertThat(rule.getRemediationFunction()).isNull();
-    assertThat(rule.getRemediationCoefficient()).isNull();
-    assertThat(rule.getRemediationOffset()).isNull();
-    assertThat(rule.getUpdatedAt()).isEqualTo(now);
-  }
-
-  @Test
-  public void restore_from_language_do_not_disable_no_more_existing_characteristics() throws Exception {
-    when(characteristicsXMLImporter.importXML(any(Reader.class))).thenReturn(new DebtModel()
-      .addRootCharacteristic(new DefaultDebtCharacteristic().setKey("PORTABILITY").setName("Portability").setOrder(1))
-      // No more existing characteristic
-      .addSubCharacteristic(new DefaultDebtCharacteristic().setKey("COMPILER").setName("Compiler"), "PORTABILITY"));
-
-    when(dao.selectEnabledCharacteristics(session)).thenReturn(newArrayList(
-      new CharacteristicDto().setId(1).setKey("PORTABILITY").setName("Portability").setOrder(1))
-    );
-
-    debtModelBackup.restore("java");
-
-    verify(debtModelOperations, never()).delete(any(CharacteristicDto.class), eq(now), eq(session));
-    verify(session).commit();
-  }
-
   @Test
   public void restore_from_xml_with_different_characteristic_and_same_function() throws Exception {
     when(characteristicsXMLImporter.importXML(anyString())).thenReturn(new DebtModel()

diff --git a/sonar-server/src/test/java/org/sonar/server/debt/DebtModelServiceTest.java b/sonar-server/src/test/java/org/sonar/server/debt/DebtModelServiceTest.java
index ee08ba6ca95a4b273ea8d2442a234c52da295a62..404c1e83c3b54bb65bab1341920cd9089615a407 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/debt/DebtModelServiceTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/debt/DebtModelServiceTest.java
@@ -95,15 +95,9 @@ public class DebtModelServiceTest {
   }
 
   @Test
-  public void restore_provided_model() {
-    service.restore();
-    verify(debtModelBackup).restore();
-  }
-
-  @Test
-  public void restore_from_language() {
-    service.restoreFromLanguage("xoo");
-    verify(debtModelBackup).restore("xoo");
+  public void reset_model() {
+    service.reset();
+    verify(debtModelBackup).reset();
   }
 
   @Test

diff --git a/sonar-server/src/test/java/org/sonar/server/startup/RegisterDebtModelTest.java b/sonar-server/src/test/java/org/sonar/server/startup/RegisterDebtModelTest.java
index 456889bd9a0775cc0dc9e5829f2c9c35bcd4d64c..208e9236038b1899b7cb1f461c1f1c2960fdaa4a 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/startup/RegisterDebtModelTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/startup/RegisterDebtModelTest.java
@@ -56,7 +56,7 @@ public class RegisterDebtModelTest {
 
     registerDebtModel.start();
 
-    verify(debtModelBackup).restore();
+    verify(debtModelBackup).reset();
   }
 
   @Test