From 975b9c625513e4fb7b050150e3bc323c5ce2d561 Mon Sep 17 00:00:00 2001
From: Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
Date: Thu, 26 Jan 2017 17:36:57 +0100
Subject: SONAR-8647 add organization param to api/components/search_projects

---
 .../sonarqube/ws/client/component/ComponentsService.java |  2 ++
 .../ws/client/component/ComponentsWsParameters.java      |  1 +
 .../ws/client/component/SearchProjectsRequest.java       | 16 +++++++++++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'sonar-ws')

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/component/ComponentsService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/component/ComponentsService.java
index eb648f24109..bd555b39a44 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/component/ComponentsService.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/component/ComponentsService.java
@@ -45,6 +45,7 @@ import static org.sonarqube.ws.client.component.ComponentsWsParameters.PARAM_FRO
 import static org.sonarqube.ws.client.component.ComponentsWsParameters.PARAM_ID;
 import static org.sonarqube.ws.client.component.ComponentsWsParameters.PARAM_KEY;
 import static org.sonarqube.ws.client.component.ComponentsWsParameters.PARAM_NEW_KEY;
+import static org.sonarqube.ws.client.component.ComponentsWsParameters.PARAM_ORGANIZATION;
 import static org.sonarqube.ws.client.component.ComponentsWsParameters.PARAM_QUALIFIERS;
 import static org.sonarqube.ws.client.component.ComponentsWsParameters.PARAM_STRATEGY;
 import static org.sonarqube.ws.client.component.ComponentsWsParameters.PARAM_TO;
@@ -105,6 +106,7 @@ public class ComponentsService extends BaseService {
 
   public SearchProjectsWsResponse searchProjects(SearchProjectsRequest request) {
     GetRequest get = new GetRequest(path(ACTION_SEARCH_PROJECTS))
+      .setParam(PARAM_ORGANIZATION, request.getOrganization())
       .setParam(PARAM_FILTER, request.getFilter())
       .setParam(Param.FACETS, request.getFacets())
       .setParam(Param.PAGE, request.getPage())
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/component/ComponentsWsParameters.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/component/ComponentsWsParameters.java
index 76487243281..16ae5feb354 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/component/ComponentsWsParameters.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/component/ComponentsWsParameters.java
@@ -33,6 +33,7 @@ public class ComponentsWsParameters {
   public static final String ACTION_SUGGESTIONS = "suggestions";
 
   // parameters
+  public static final String PARAM_ORGANIZATION = "organization";
   public static final String PARAM_QUALIFIERS = "qualifiers";
   public static final String PARAM_LANGUAGE = "language";
   public static final String PARAM_BASE_COMPONENT_ID = "baseComponentId";
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/component/SearchProjectsRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/component/SearchProjectsRequest.java
index 3b6ebceeceb..c30dd9655ec 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/component/SearchProjectsRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/component/SearchProjectsRequest.java
@@ -23,6 +23,7 @@ package org.sonarqube.ws.client.component;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.CheckForNull;
+import javax.annotation.Nullable;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
@@ -33,16 +34,23 @@ public class SearchProjectsRequest {
 
   private final int page;
   private final int pageSize;
+  private final String organization;
   private final String filter;
   private final List<String> facets;
 
   private SearchProjectsRequest(Builder builder) {
     this.page = builder.page;
     this.pageSize = builder.pageSize;
+    this.organization = builder.organization;
     this.filter = builder.filter;
     this.facets = builder.facets;
   }
 
+  @CheckForNull
+  public String getOrganization() {
+    return organization;
+  }
+
   @CheckForNull
   public String getFilter() {
     return filter;
@@ -65,6 +73,7 @@ public class SearchProjectsRequest {
   }
 
   public static class Builder {
+    private String organization;
     private Integer page;
     private Integer pageSize;
     private String filter;
@@ -74,7 +83,12 @@ public class SearchProjectsRequest {
       // enforce static factory method
     }
 
-    public Builder setFilter(String filter) {
+    public Builder setOrganization(@Nullable String organization) {
+      this.organization = organization;
+      return this;
+    }
+
+    public Builder setFilter(@Nullable String filter) {
       this.filter = filter;
       return this;
     }
-- 
cgit v1.2.3