SONAR-5242 - Fixed deactiveRule for qualityprofile WS

diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/persistence/ActiveRuleDao.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/persistence/ActiveRuleDao.java
index 690eb101e9b4d2d275b91c709a4d31d5f902e180..898593d0010f4c28298a8dc8f8abea58e6381de2 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/persistence/ActiveRuleDao.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/persistence/ActiveRuleDao.java
@@ -188,8 +188,13 @@ public class ActiveRuleDao extends BaseDao<ActiveRuleMapper, ActiveRuleDto, Acti
   }
 
   public List<ActiveRuleDto> findByProfileKey(QualityProfileKey profileKey, DbSession session) {
-    int id = this.getQualityProfileId(profileKey, session);
-    return mapper(session).selectByProfileId(id);
+    //TODO try/catch due to legacy selectByProfileId SQL.
+    try {
+      int id = this.getQualityProfileId(profileKey, session);
+      return mapper(session).selectByProfileId(id);
+    } catch (Exception e) {
+      throw new IllegalArgumentException("Quality profile not found: "+profileKey.toString());
+    }
   }
 
   public void removeParamByProfileKey(QualityProfileKey profileKey, DbSession session) {

diff --git a/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java b/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
index 4283af1c6ca55f7c34785daab854b63ff683a162..43aa32371df96778717da1d2ceab5d23deb75ab0 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
@@ -255,8 +255,8 @@ public abstract class BaseIndex<D, E extends Dto<K>, K extends Serializable>
     getClient()
       .prepareDelete()
       .setIndex(this.getIndexName())
-      .setType(this.indexDefinition.getIndexType())
-      .setIndex(this.getKeyValue(key))
+      .setType(this.getIndexType())
+      .setId(this.getKeyValue(key))
       .get();
   }
 
@@ -266,7 +266,7 @@ public abstract class BaseIndex<D, E extends Dto<K>, K extends Serializable>
       //TODO don't really know what to do here for the moment...
     } else {
       throw new IllegalStateException("Index " + this.getIndexName() +
-        " cannot execute INSERT for class: " + obj.getClass());
+        " cannot execute DELETE for class: " + obj.getClass());
     }
   }
 
@@ -275,7 +275,7 @@ public abstract class BaseIndex<D, E extends Dto<K>, K extends Serializable>
     try {
       this.deleteDocument(key);
     } catch (Exception e) {
-      LOG.error("Could not DELETE _id:{} for index {}: {}",
+      LOG.error("Could not DELETE _id = '{}' for index '{}': {}",
         this.getKeyValue(key), this.getIndexName(), e.getMessage());
     }
   }

diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleServiceMediumTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleServiceMediumTest.java
index e949da77da7980ac44c4b81d5613e5546c0309a2..1c90461cf1f323f372879562bc9bfa3aa98803b0 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleServiceMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleServiceMediumTest.java
@@ -302,7 +302,6 @@ public class ActiveRuleServiceMediumTest {
   }
 
   @Test
-  @Ignore
   public void deactivate() throws Exception {
     // activation
     grantPermission();
@@ -343,7 +342,6 @@ public class ActiveRuleServiceMediumTest {
   }
 
   @Test
-  @Ignore
   public void deactivation_fails_if_profile_not_found() throws Exception {
     grantPermission();
     ActiveRuleKey key = ActiveRuleKey.of(QualityProfileKey.of("other", "js"), RuleKey.of("xoo", "x1"));
@@ -352,7 +350,6 @@ public class ActiveRuleServiceMediumTest {
       fail();
     } catch (IllegalArgumentException e) {
       assertThat(e).hasMessage("Quality profile not found: other:js");
-      verifyZeroActiveRules(key);
     }
   }