From 8860271840f039fd533a9f94ac7ac011623a37e1 Mon Sep 17 00:00:00 2001
From: Teryk Bellahsene <teryk.bellahsene@sonarsource.com>
Date: Thu, 9 Mar 2017 18:02:21 +0100
Subject: [PATCH] SONAR-8892 Rename OrganizationsAction to
 OrganizationsWsAction

---
 .../org/sonar/server/organization/ws/AddMemberAction.java   | 2 +-
 .../java/org/sonar/server/organization/ws/CreateAction.java | 2 +-
 .../java/org/sonar/server/organization/ws/DeleteAction.java | 2 +-
 .../sonar/server/organization/ws/EnableSupportAction.java   | 2 +-
 .../org/sonar/server/organization/ws/OrganizationsWs.java   | 6 +++---
 ...{OrganizationsAction.java => OrganizationsWsAction.java} | 2 +-
 .../java/org/sonar/server/organization/ws/SearchAction.java | 2 +-
 .../server/organization/ws/SearchMyOrganizationsAction.java | 2 +-
 .../java/org/sonar/server/organization/ws/UpdateAction.java | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename server/sonar-server/src/main/java/org/sonar/server/organization/ws/{OrganizationsAction.java => OrganizationsWsAction.java} (94%)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/AddMemberAction.java b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/AddMemberAction.java
index daf610d508a..8de6650a589 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/AddMemberAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/AddMemberAction.java
@@ -40,7 +40,7 @@ import static org.sonar.server.ws.KeyExamples.KEY_ORG_EXAMPLE_001;
 import static org.sonar.server.ws.WsUtils.checkFound;
 import static org.sonar.server.ws.WsUtils.checkFoundWithOptional;
 
-public class AddMemberAction implements OrganizationsAction {
+public class AddMemberAction implements OrganizationsWsAction {
   private final DbClient dbClient;
   private final UserSession userSession;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/CreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/CreateAction.java
index 58fe96f8865..bc628ee1fa5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/CreateAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/CreateAction.java
@@ -40,7 +40,7 @@ import static org.sonar.server.organization.OrganizationCreation.NewOrganization
 import static org.sonar.server.organization.ws.OrganizationsWsSupport.PARAM_KEY;
 import static org.sonar.server.ws.WsUtils.writeProtobuf;
 
-public class CreateAction implements OrganizationsAction {
+public class CreateAction implements OrganizationsWsAction {
   private static final String ACTION = "create";
 
   private final Settings settings;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/DeleteAction.java b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/DeleteAction.java
index c81c1969776..53053d9a06b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/DeleteAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/DeleteAction.java
@@ -38,7 +38,7 @@ import static org.sonar.server.organization.ws.OrganizationsWsSupport.PARAM_KEY;
 import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
 import static org.sonar.server.ws.WsUtils.checkFoundWithOptional;
 
-public class DeleteAction implements OrganizationsAction {
+public class DeleteAction implements OrganizationsWsAction {
   private static final String ACTION = "delete";
 
   private final UserSession userSession;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/EnableSupportAction.java b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/EnableSupportAction.java
index e35f154b9fd..7e32a6f0655 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/EnableSupportAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/EnableSupportAction.java
@@ -31,7 +31,7 @@ import org.sonar.server.user.UserSession;
 
 import static java.util.Objects.requireNonNull;
 
-public class EnableSupportAction implements OrganizationsAction {
+public class EnableSupportAction implements OrganizationsWsAction {
   private static final String ACTION = "enable_support";
 
   private final UserSession userSession;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWs.java b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWs.java
index e5f9ec37c85..5af260e4fd6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWs.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWs.java
@@ -22,9 +22,9 @@ package org.sonar.server.organization.ws;
 import org.sonar.api.server.ws.WebService;
 
 public class OrganizationsWs implements WebService {
-  private final OrganizationsAction[] actions;
+  private final OrganizationsWsAction[] actions;
 
-  public OrganizationsWs(OrganizationsAction... actions) {
+  public OrganizationsWs(OrganizationsWsAction... actions) {
     this.actions = actions;
   }
 
@@ -33,7 +33,7 @@ public class OrganizationsWs implements WebService {
     NewController controller = context.createController("api/organizations")
       .setSince("6.2")
       .setDescription("Manage organizations.");
-    for (OrganizationsAction action : actions) {
+    for (OrganizationsWsAction action : actions) {
       action.define(controller);
     }
     controller.done();
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsAction.java b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsAction.java
similarity index 94%
rename from server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsAction.java
rename to server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsAction.java
index 75e1bc66d66..5014029679c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/OrganizationsWsAction.java
@@ -21,5 +21,5 @@ package org.sonar.server.organization.ws;
 
 import org.sonar.server.ws.WsAction;
 
-public interface OrganizationsAction extends WsAction {
+public interface OrganizationsWsAction extends WsAction {
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchAction.java
index 2068df1a2fe..83313c89bec 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchAction.java
@@ -35,7 +35,7 @@ import org.sonarqube.ws.Organizations.Organization;
 import static org.sonar.db.organization.OrganizationQuery.newOrganizationQueryBuilder;
 import static org.sonar.server.ws.WsUtils.writeProtobuf;
 
-public class SearchAction implements OrganizationsAction {
+public class SearchAction implements OrganizationsWsAction {
   private static final String PARAM_ORGANIZATIONS = "organizations";
   private static final String ACTION = "search";
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchMyOrganizationsAction.java b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchMyOrganizationsAction.java
index 738ca36fe0a..c65e86220b3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchMyOrganizationsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/SearchMyOrganizationsAction.java
@@ -28,7 +28,7 @@ import org.sonar.db.DbSession;
 import org.sonar.db.permission.OrganizationPermission;
 import org.sonar.server.user.UserSession;
 
-public class SearchMyOrganizationsAction implements OrganizationsAction {
+public class SearchMyOrganizationsAction implements OrganizationsWsAction {
   private static final String ACTION = "search_my_organizations";
 
   private final UserSession userSession;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/UpdateAction.java b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/UpdateAction.java
index 6d4f4151536..899b7efbb96 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/ws/UpdateAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/organization/ws/UpdateAction.java
@@ -42,7 +42,7 @@ import static org.sonar.server.organization.ws.OrganizationsWsSupport.PARAM_URL;
 import static org.sonar.db.permission.OrganizationPermission.ADMINISTER;
 import static org.sonar.server.ws.WsUtils.writeProtobuf;
 
-public class UpdateAction implements OrganizationsAction {
+public class UpdateAction implements OrganizationsWsAction {
   private static final String ACTION = "update";
 
   private final UserSession userSession;
-- 
2.39.5