SONAR-7923 Create WS api/qualitygates/get_by_project

server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java

@@ -180,18 +180,7 @@
 import org.sonar.server.project.ws.ProjectsWsModule;
 import org.sonar.server.projectlink.ws.ProjectLinksModule;
 import org.sonar.server.properties.ProjectSettingsFactory;
-import org.sonar.server.qualitygate.QgateProjectFinder;
-import org.sonar.server.qualitygate.QualityGates;
-import org.sonar.server.qualitygate.ws.CreateConditionAction;
-import org.sonar.server.qualitygate.ws.DeleteConditionAction;
-import org.sonar.server.qualitygate.ws.DeselectAction;
-import org.sonar.server.qualitygate.ws.DestroyAction;
-import org.sonar.server.qualitygate.ws.ProjectStatusAction;
-import org.sonar.server.qualitygate.ws.QualityGatesWs;
-import org.sonar.server.qualitygate.ws.SelectAction;
-import org.sonar.server.qualitygate.ws.SetAsDefaultAction;
-import org.sonar.server.qualitygate.ws.UnsetDefaultAction;
-import org.sonar.server.qualitygate.ws.UpdateConditionAction;
+import org.sonar.server.qualitygate.QualityGateModule;
 import org.sonar.server.qualityprofile.BuiltInProfiles;
 import org.sonar.server.qualityprofile.QProfileBackuper;
 import org.sonar.server.qualityprofile.QProfileComparison;
@@ -462,26 +451,7 @@ protected void configureLevel() {
       DefaultMetricFinder.class,
       TimeMachineWs.class,
 
-      // quality gates
-      QualityGates.class,
-      QgateProjectFinder.class,
-      org.sonar.server.qualitygate.ws.ListAction.class,
-      org.sonar.server.qualitygate.ws.SearchAction.class,
-      org.sonar.server.qualitygate.ws.ShowAction.class,
-      org.sonar.server.qualitygate.ws.CreateAction.class,
-      org.sonar.server.qualitygate.ws.RenameAction.class,
-      org.sonar.server.qualitygate.ws.CopyAction.class,
-      DestroyAction.class,
-      SetAsDefaultAction.class,
-      UnsetDefaultAction.class,
-      SelectAction.class,
-      DeselectAction.class,
-      CreateConditionAction.class,
-      DeleteConditionAction.class,
-      UpdateConditionAction.class,
-      org.sonar.server.qualitygate.ws.AppAction.class,
-      ProjectStatusAction.class,
-      QualityGatesWs.class,
+      QualityGateModule.class,
 
       // web services
       WebServiceEngine.class,

server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java

@@ -0,0 +1,69 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * 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.server.qualitygate;
+
+import org.sonar.core.platform.Module;
+import org.sonar.server.qualitygate.ws.AppAction;
+import org.sonar.server.qualitygate.ws.CopyAction;
+import org.sonar.server.qualitygate.ws.CreateAction;
+import org.sonar.server.qualitygate.ws.CreateConditionAction;
+import org.sonar.server.qualitygate.ws.DeleteConditionAction;
+import org.sonar.server.qualitygate.ws.DeselectAction;
+import org.sonar.server.qualitygate.ws.DestroyAction;
+import org.sonar.server.qualitygate.ws.GetByProjectAction;
+import org.sonar.server.qualitygate.ws.ListAction;
+import org.sonar.server.qualitygate.ws.ProjectStatusAction;
+import org.sonar.server.qualitygate.ws.QualityGatesWs;
+import org.sonar.server.qualitygate.ws.RenameAction;
+import org.sonar.server.qualitygate.ws.SearchAction;
+import org.sonar.server.qualitygate.ws.SelectAction;
+import org.sonar.server.qualitygate.ws.SetAsDefaultAction;
+import org.sonar.server.qualitygate.ws.ShowAction;
+import org.sonar.server.qualitygate.ws.UnsetDefaultAction;
+import org.sonar.server.qualitygate.ws.UpdateConditionAction;
+
+public class QualityGateModule extends Module {
+  @Override
+  protected void configureModule() {
+    add(
+      QualityGates.class,
+      QgateProjectFinder.class,
+      // WS
+      QualityGatesWs.class,
+      ListAction.class,
+      SearchAction.class,
+      ShowAction.class,
+      CreateAction.class,
+      RenameAction.class,
+      CopyAction.class,
+      DestroyAction.class,
+      SetAsDefaultAction.class,
+      UnsetDefaultAction.class,
+      SelectAction.class,
+      DeselectAction.class,
+      CreateConditionAction.class,
+      DeleteConditionAction.class,
+      UpdateConditionAction.class,
+      AppAction.class,
+      ProjectStatusAction.class,
+      GetByProjectAction.class);
+  }
+}

server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java

@@ -21,22 +21,22 @@
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Strings;
-import com.google.common.collect.Collections2;
 import java.util.Collection;
+import java.util.stream.Collectors;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.ibatis.session.SqlSession;
 import org.sonar.api.config.Settings;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Metric;
 import org.sonar.api.measures.Metric.ValueType;
 import org.sonar.api.measures.MetricFinder;
 import org.sonar.api.web.UserRole;
 import org.sonar.core.permission.GlobalPermissions;
+import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.MyBatis;
 import org.sonar.db.component.ComponentDao;
@@ -56,7 +56,6 @@
 import org.sonar.server.user.UserSession;
 import org.sonar.server.util.Validation;
 
-import static com.google.common.collect.FluentIterable.from;
 import static java.lang.String.format;
 
 /**
@@ -66,23 +65,22 @@ public class QualityGates {
 
   public static final String SONAR_QUALITYGATE_PROPERTY = "sonar.qualitygate";
 
+  private final DbClient dbClient;
   private final QualityGateDao dao;
   private final QualityGateConditionDao conditionDao;
   private final MetricFinder metricFinder;
   private final PropertiesDao propertiesDao;
   private final ComponentDao componentDao;
-  private final MyBatis myBatis;
   private final UserSession userSession;
   private final Settings settings;
 
-  public QualityGates(QualityGateDao dao, QualityGateConditionDao conditionDao, MetricFinder metricFinder, PropertiesDao propertiesDao, ComponentDao componentDao,
-    MyBatis myBatis, UserSession userSession, Settings settings) {
-    this.dao = dao;
-    this.conditionDao = conditionDao;
+  public QualityGates(DbClient dbClient, MetricFinder metricFinder, UserSession userSession, Settings settings) {
+    this.dbClient = dbClient;
+    this.dao = dbClient.qualityGateDao();
+    this.conditionDao = dbClient.gateConditionDao();
     this.metricFinder = metricFinder;
-    this.propertiesDao = propertiesDao;
-    this.componentDao = componentDao;
-    this.myBatis = myBatis;
+    this.propertiesDao = dbClient.propertiesDao();
+    this.componentDao = dbClient.componentDao();
     this.userSession = userSession;
     this.settings = settings;
   }
@@ -117,18 +115,18 @@ public QualityGateDto copy(long sourceId, String destinationName) {
     getNonNullQgate(sourceId);
     validateQualityGate(null, destinationName);
     QualityGateDto destinationGate = new QualityGateDto().setName(destinationName);
-    SqlSession session = myBatis.openSession(false);
+    DbSession dbSession = dbClient.openSession(false);
     try {
-      dao.insert(destinationGate, session);
-      for (QualityGateConditionDto sourceCondition : conditionDao.selectForQualityGate(sourceId, session)) {
+      dao.insert(dbSession, destinationGate);
+      for (QualityGateConditionDto sourceCondition : conditionDao.selectForQualityGate(sourceId, dbSession)) {
         conditionDao.insert(new QualityGateConditionDto().setQualityGateId(destinationGate.getId())
           .setMetricId(sourceCondition.getMetricId()).setOperator(sourceCondition.getOperator())
           .setWarningThreshold(sourceCondition.getWarningThreshold()).setErrorThreshold(sourceCondition.getErrorThreshold()).setPeriod(sourceCondition.getPeriod()),
-          session);
+          dbSession);
       }
-      session.commit();
+      dbSession.commit();
     } finally {
-      MyBatis.closeQuietly(session);
+      MyBatis.closeQuietly(dbSession);
     }
     return destinationGate;
   }
@@ -140,7 +138,7 @@ public Collection<QualityGateDto> list() {
   public void delete(long idToDelete) {
     checkPermission();
     QualityGateDto qGate = getNonNullQgate(idToDelete);
-    DbSession session = myBatis.openSession(false);
+    DbSession session = dbClient.openSession(false);
     try {
       if (isDefault(qGate)) {
         propertiesDao.deleteGlobalProperty(SONAR_QUALITYGATE_PROPERTY, session);
@@ -228,7 +226,7 @@ public void deleteCondition(Long condId) {
   }
 
   public void associateProject(Long qGateId, Long projectId) {
-    DbSession session = myBatis.openSession(false);
+    DbSession session = dbClient.openSession(false);
     try {
       getNonNullQgate(qGateId);
       checkPermission(projectId, session);
@@ -239,7 +237,7 @@ public void associateProject(Long qGateId, Long projectId) {
   }
 
   public void dissociateProject(Long qGateId, Long projectId) {
-    DbSession session = myBatis.openSession(false);
+    DbSession session = dbClient.openSession(false);
     try {
       getNonNullQgate(qGateId);
       checkPermission(projectId, session);
@@ -250,12 +248,9 @@ public void dissociateProject(Long qGateId, Long projectId) {
   }
 
   public Collection<Metric> gateMetrics() {
-    return Collections2.filter(metricFinder.findAll(), new Predicate<Metric>() {
-      @Override
-      public boolean apply(Metric metric) {
-        return isAvailableForInit(metric);
-      }
-    });
+    return metricFinder.findAll().stream()
+      .filter(QualityGates::isAvailableForInit)
+      .collect(Collectors.toList());
   }
 
   public boolean currentUserHasWritePermission() {
@@ -274,7 +269,9 @@ private Collection<QualityGateConditionDto> getConditions(long qGateId, @Nullabl
     if (conditionId == null) {
       return conditions;
     }
-    return from(conditionDao.selectForQualityGate(qGateId)).filter(new MatchConditionId(conditionId)).toList();
+    return conditionDao.selectForQualityGate(qGateId).stream()
+      .filter(condition -> condition.getId() != conditionId)
+      .collect(Collectors.toList());
   }
 
   private static void validateCondition(Metric metric, String operator, @Nullable String warningThreshold, @Nullable String errorThreshold, @Nullable Integer period) {
@@ -293,7 +290,7 @@ private static void checkConditionDoesNotAlreadyExistOnSameMetricAndPeriod(Colle
       return;
     }
 
-    boolean conditionExists = from(conditions).anyMatch(new MatchMetricAndPeriod(metric.getId(), period));
+    boolean conditionExists = conditions.stream().anyMatch(new MatchMetricAndPeriod(metric.getId(), period)::apply);
     if (conditionExists) {
       String errorMessage = period == null
         ? format("Condition on metric '%s' already exists.", metric.getName())
@@ -421,18 +418,4 @@ public boolean apply(@Nonnull QualityGateConditionDto input) {
         ObjectUtils.equals(input.getPeriod(), period);
     }
   }
-
-  private static class MatchConditionId implements Predicate<QualityGateConditionDto> {
-    private final long conditionId;
-
-    private MatchConditionId(long conditionId) {
-      this.conditionId = conditionId;
-    }
-
-    @Override
-    public boolean apply(@Nonnull QualityGateConditionDto input) {
-      return input.getId() != conditionId;
-    }
-  }
-
 }

server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CopyAction.java

@@ -26,6 +26,9 @@
 import org.sonar.db.qualitygate.QualityGateDto;
 import org.sonar.server.qualitygate.QualityGates;
 
+import static org.sonarqube.ws.client.qualitygate.QualityGatesWsParameters.PARAM_ID;
+import static org.sonarqube.ws.client.qualitygate.QualityGatesWsParameters.PARAM_NAME;
+
 public class CopyAction implements QualityGatesWsAction {
 
   private final QualityGates qualityGates;
@@ -42,20 +45,20 @@ public void define(WebService.NewController controller) {
       .setSince("4.3")
       .setHandler(this);
 
-    action.createParam(QualityGatesWs.PARAM_ID)
+    action.createParam(PARAM_ID)
       .setDescription("The ID of the source quality gate")
       .setRequired(true)
       .setExampleValue("1");
 
-    action.createParam(QualityGatesWs.PARAM_NAME)
+    action.createParam(PARAM_NAME)
       .setDescription("The name of the quality gate to create")
       .setRequired(true)
       .setExampleValue("My Quality Gate");
   }
 
   @Override
   public void handle(Request request, Response response) {
-    QualityGateDto newQualityGate = qualityGates.copy(QualityGatesWs.parseId(request, QualityGatesWs.PARAM_ID), request.mandatoryParam(QualityGatesWs.PARAM_NAME));
+    QualityGateDto newQualityGate = qualityGates.copy(QualityGatesWs.parseId(request, PARAM_ID), request.mandatoryParam(PARAM_NAME));
     JsonWriter writer = response.newJsonWriter();
     QualityGatesWs.writeQualityGate(newQualityGate, writer).close();
   }

server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java

@@ -25,6 +25,7 @@
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.db.qualitygate.QualityGateDto;
 import org.sonar.server.qualitygate.QualityGates;
+import org.sonarqube.ws.client.qualitygate.QualityGatesWsParameters;
 
 public class CreateAction implements QualityGatesWsAction {
 
@@ -42,15 +43,15 @@ public void define(WebService.NewController controller) {
       .setPost(true)
       .setHandler(this);
 
-    action.createParam(QualityGatesWs.PARAM_NAME)
+    action.createParam(QualityGatesWsParameters.PARAM_NAME)
       .setDescription("The name of the quality gate to create")
       .setRequired(true)
       .setExampleValue("My Quality Gate");
   }
 
   @Override
   public void handle(Request request, Response response) {
-    QualityGateDto newQualityGate = qualityGates.create(request.mandatoryParam(QualityGatesWs.PARAM_NAME));
+    QualityGateDto newQualityGate = qualityGates.create(request.mandatoryParam(QualityGatesWsParameters.PARAM_NAME));
     JsonWriter writer = response.newJsonWriter();
     QualityGatesWs.writeQualityGate(newQualityGate, writer).close();
   }

server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateConditionAction.java

@@ -23,6 +23,7 @@
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.server.qualitygate.QualityGates;
+import org.sonarqube.ws.client.qualitygate.QualityGatesWsParameters;
 
 public class CreateConditionAction implements QualityGatesWsAction {
 
@@ -41,7 +42,7 @@ public void define(WebService.NewController controller) {
       .setHandler(this);
 
     createCondition
-      .createParam(QualityGatesWs.PARAM_GATE_ID)
+      .createParam(QualityGatesWsParameters.PARAM_GATE_ID)
       .setDescription("ID of the quality gate")
       .setRequired(true)
       .setExampleValue("1");
@@ -53,12 +54,12 @@ public void define(WebService.NewController controller) {
   public void handle(Request request, Response response) {
     QualityGatesWs.writeQualityGateCondition(
       qualityGates.createCondition(
-        QualityGatesWs.parseId(request, QualityGatesWs.PARAM_GATE_ID),
-        request.mandatoryParam(QualityGatesWs.PARAM_METRIC),
-        request.mandatoryParam(QualityGatesWs.PARAM_OPERATOR),
-        request.param(QualityGatesWs.PARAM_WARNING),
-        request.param(QualityGatesWs.PARAM_ERROR),
-        request.paramAsInt(QualityGatesWs.PARAM_PERIOD)
+        QualityGatesWs.parseId(request, QualityGatesWsParameters.PARAM_GATE_ID),
+        request.mandatoryParam(QualityGatesWsParameters.PARAM_METRIC),
+        request.mandatoryParam(QualityGatesWsParameters.PARAM_OPERATOR),
+        request.param(QualityGatesWsParameters.PARAM_WARNING),
+        request.param(QualityGatesWsParameters.PARAM_ERROR),
+        request.paramAsInt(QualityGatesWsParameters.PARAM_PERIOD)
         ), response.newJsonWriter()
       ).close();
   }