SONAR-9303 WS api/qualityprofiles/restore_built_in returns http 410 w…

…hen called

it/it-tests/src/test/java/it/analysis/IssuesModeTest.java

@@ -207,9 +207,8 @@ public void only_scan_changed_files_on_change() throws IOException {
 
   // SONAR-8518
   @Test
-  public void shoud_support_sonar_profile_prop() throws IOException {
+  public void should_support_sonar_profile_prop() throws IOException {
     restoreProfile("one-issue-per-line.xml");
-    restoreProfile("empty.xml");
     orchestrator.getServer().provisionProject("sample", "xoo-sample");
     orchestrator.getServer().associateProjectToQualityProfile("sample", "xoo", "empty");
 

it/it-tests/src/test/java/it/qualityProfile/OrganizationQualityProfilesPageTest.java

@@ -152,9 +152,7 @@ public void testSettingDefault() throws Exception {
   public void testRestoration() throws Exception {
     deleteProfile("xoo", "empty");
 
-    runSelenese(orchestrator,
-      "/organization/OrganizationQualityProfilesPageTest/should_restore.html",
-      "/organization/OrganizationQualityProfilesPageTest/should_restore_built_in.html");
+    runSelenese(orchestrator, "/organization/OrganizationQualityProfilesPageTest/should_restore.html");
   }
 
   private static void createProfile(String language, String name) {

it/it-tests/src/test/java/it/qualityProfile/QualityProfilesPageTest.java

@@ -134,9 +134,7 @@ public void testSettingDefault() throws Exception {
   public void testRestoration() throws Exception {
     deleteProfile("xoo", "empty");
 
-    runSelenese(orchestrator,
-      "/qualityProfile/QualityProfilesPageTest/should_restore.html",
-      "/qualityProfile/QualityProfilesPageTest/should_restore_built_in.html");
+    runSelenese(orchestrator, "/qualityProfile/QualityProfilesPageTest/should_restore.html");
   }
 
   private static void createProfile(String language, String name) {

server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java

@@ -34,6 +34,7 @@
 import org.sonar.server.exceptions.BadRequestException;
 import org.sonar.server.qualityprofile.index.ActiveRuleIndexer;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static org.sonar.server.ws.WsUtils.checkRequest;
 
 /**
@@ -55,12 +56,20 @@ public QProfileFactory(DbClient db, UuidFactory uuidFactory, System2 system2, Ac
 
   // ------------- CREATION
 
+  private static OrganizationDto requireNonNull(@Nullable OrganizationDto organization) {
+    Objects.requireNonNull(organization, "Organization is required, when creating a quality profile.");
+    return organization;
+  }
+
   RulesProfileDto getOrCreateCustom(DbSession dbSession, OrganizationDto organization, QProfileName name) {
     requireNonNull(organization);
     RulesProfileDto profile = db.qualityProfileDao().selectByNameAndLanguage(organization, name.getName(), name.getLanguage(), dbSession);
     if (profile == null) {
       profile = doCreate(dbSession, organization, name, false, false);
+    } else {
+      checkArgument(!profile.isBuiltIn(), "Operation forbidden for built-in Quality Profile '%s' with language '%s'", profile.getName(), profile.getLanguage());
     }
+
     return profile;
   }
 
@@ -85,11 +94,6 @@ public RulesProfileDto createBuiltIn(DbSession dbSession, OrganizationDto organi
     return doCreate(dbSession, requireNonNull(organization), name, isDefault, true);
   }
 
-  private static OrganizationDto requireNonNull(@Nullable OrganizationDto organization) {
-    Objects.requireNonNull(organization, "Organization is required, when creating a quality profile.");
-    return organization;
-  }
-
   private RulesProfileDto doCreate(DbSession dbSession, OrganizationDto organization, QProfileName name, boolean isDefault, boolean isBuiltIn) {
     if (StringUtils.isEmpty(name.getName())) {
       throw BadRequestException.create("quality_profiles.profile_name_cant_be_blank");

server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java

@@ -21,15 +21,9 @@
 
 import java.util.Collection;
 import org.sonar.db.DbSession;
-import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.qualityprofile.RulesProfileDto;
 
 public interface QProfileReset {
-  /**
-   * Restore the built-in profiles provided by plugins for the specified language.
-   * Missing profiles are created and existing ones are updated.
-   */
-  void resetLanguage(DbSession dbSession, OrganizationDto organization, String language);
 
   /**
    * Reset the rules of the specified profile.

server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResetImpl.java

@@ -19,84 +19,41 @@
  */
 package org.sonar.server.qualityprofile;
 
-import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import org.sonar.api.rule.RuleKey;
-import org.sonar.api.rules.ActiveRule;
-import org.sonar.api.rules.ActiveRuleParam;
 import org.sonar.api.server.ServerSide;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
-import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.qualityprofile.ActiveRuleDto;
 import org.sonar.db.qualityprofile.ActiveRuleKey;
 import org.sonar.db.qualityprofile.RulesProfileDto;
-import org.sonar.db.rule.RuleParamDto;
 import org.sonar.server.exceptions.BadRequestException;
 import org.sonar.server.qualityprofile.index.ActiveRuleIndexer;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
 @ServerSide
 public class QProfileResetImpl implements QProfileReset {
 
   private final DbClient db;
-  private final QProfileFactory factory;
   private final RuleActivator activator;
   private final ActiveRuleIndexer activeRuleIndexer;
-  private final BuiltInQProfileRepository builtInQProfileRepositories;
 
-  public QProfileResetImpl(DbClient db, RuleActivator activator, ActiveRuleIndexer activeRuleIndexer, QProfileFactory factory,
-    BuiltInQProfileRepository builtInQProfileRepository) {
+  public QProfileResetImpl(DbClient db, RuleActivator activator, ActiveRuleIndexer activeRuleIndexer) {
     this.db = db;
     this.activator = activator;
     this.activeRuleIndexer = activeRuleIndexer;
-    this.factory = factory;
-    this.builtInQProfileRepositories = builtInQProfileRepository;
-  }
-
-  @Override
-  public void resetLanguage(DbSession dbSession, OrganizationDto organization, String language) {
-    builtInQProfileRepositories.getQProfilesByLanguage()
-      .entrySet()
-      .stream()
-      .filter(entry -> entry.getKey().equals(language))
-      .map(Map.Entry::getValue)
-      .flatMap(List::stream)
-      .forEach(builtInQProfile -> resetProfile(dbSession, organization, builtInQProfile));
-  }
-
-  private void resetProfile(DbSession dbSession, OrganizationDto organization, BuiltInQProfile builtInQProfile) {
-    RulesProfileDto profile = factory.getOrCreateCustom(dbSession, organization, builtInQProfile.getQProfileName());
-
-    List<RuleActivation> activations = Lists.newArrayList();
-    builtInQProfile.getActiveRules().forEach(activeRule -> activations.add(getRuleActivation(dbSession, activeRule)));
-    reset(dbSession, profile, activations);
-  }
-
-  private RuleActivation getRuleActivation(DbSession dbSession, ActiveRule activeRule) {
-    RuleActivation activation = new RuleActivation(RuleKey.of(activeRule.getRepositoryKey(), activeRule.getRuleKey()));
-    activation.setSeverity(activeRule.getSeverity().name());
-    if (!activeRule.getActiveRuleParams().isEmpty()) {
-      for (ActiveRuleParam param : activeRule.getActiveRuleParams()) {
-        activation.setParameter(param.getParamKey(), param.getValue());
-      }
-    } else {
-      for (RuleParamDto param : db.ruleDao().selectRuleParamsByRuleKey(dbSession, activeRule.getRule().ruleKey())) {
-        activation.setParameter(param.getName(), param.getDefaultValue());
-      }
-    }
-    return activation;
   }
 
   @Override
   public BulkChangeResult reset(DbSession dbSession, RulesProfileDto profile, Collection<RuleActivation> activations) {
     requireNonNull(profile.getId(), "Quality profile must be persisted");
+    checkArgument(!profile.isBuiltIn(), "Operation forbidden for built-in Quality Profile '%s'", profile.getKee());
     BulkChangeResult result = new BulkChangeResult();
     Set<RuleKey> ruleToBeDeactivated = Sets.newHashSet();
     // Keep reference to all the activated rules before backup restore

server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ActivateRuleAction.java

@@ -30,6 +30,7 @@
 import org.sonar.core.util.Uuids;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
+import org.sonar.db.qualityprofile.RulesProfileDto;
 import org.sonar.server.qualityprofile.ActiveRuleChange;
 import org.sonar.server.qualityprofile.RuleActivation;
 import org.sonar.server.qualityprofile.RuleActivator;
@@ -106,7 +107,9 @@ public void handle(Request request, Response response) throws Exception {
     String profileKey = request.mandatoryParam(PARAM_PROFILE_KEY);
     userSession.checkLoggedIn();
     try (DbSession dbSession = dbClient.openSession(false)) {
-      wsSupport.checkPermission(dbSession, profileKey);
+      RulesProfileDto profile = wsSupport.getProfile(dbSession, QProfileReference.fromKey(profileKey));
+      wsSupport.checkPermission(dbSession, profile);
+      wsSupport.checkNotBuiltInt(profile);
       List<ActiveRuleChange> changes = ruleActivator.activate(dbSession, activation, profileKey);
       dbSession.commit();
       activeRuleIndexer.index(changes);