Introduce WsAction interface for WsActions in server module

7 files changed, 44 insertions, 24 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsAction.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsAction.java
index e14ccc782cb..f49cb281301 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsAction.java
@@ -19,11 +19,9 @@
  */
 package org.sonar.server.dashboard.ws;
 
-import org.sonar.api.server.ws.Definable;
-import org.sonar.api.server.ws.RequestHandler;
-import org.sonar.api.server.ws.WebService;
+import org.sonar.server.ws.WsAction;
 
-public interface DashboardsAction extends RequestHandler, Definable<WebService.NewController> {
+public interface DashboardsAction extends WsAction {
 
   // Marker interface
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/BaseIssuesWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/BaseIssuesWsAction.java
index 6b601b9a192..60fa19cf591 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/BaseIssuesWsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/BaseIssuesWsAction.java
@@ -19,11 +19,9 @@
  */
 package org.sonar.server.issue.ws;
 
-import org.sonar.api.server.ws.Definable;
-import org.sonar.api.server.ws.RequestHandler;
-import org.sonar.api.server.ws.WebService;
+import org.sonar.server.ws.WsAction;
 
-interface BaseIssuesWsAction extends RequestHandler, Definable<WebService.NewController> {
+interface BaseIssuesWsAction extends WsAction {
 
   // Marker interface
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWsAction.java
index c78a3d7651e..0e3cb720195 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemWsAction.java
@@ -20,11 +20,9 @@
 
 package org.sonar.server.platform.ws;
 
-import org.sonar.api.server.ws.Definable;
-import org.sonar.api.server.ws.RequestHandler;
-import org.sonar.api.server.ws.WebService;
+import org.sonar.server.ws.WsAction;
 
-public interface SystemWsAction extends RequestHandler, Definable<WebService.NewController> {
+public interface SystemWsAction extends WsAction {
 
   // Marker interface
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BaseQProfileWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BaseQProfileWsAction.java
index 54c4e1a210f..68a1d96e33d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BaseQProfileWsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BaseQProfileWsAction.java
@@ -19,14 +19,12 @@
  */
 package org.sonar.server.qualityprofile.ws;
 
-import org.sonar.api.server.ws.Definable;
-import org.sonar.api.server.ws.RequestHandler;
-import org.sonar.api.server.ws.WebService;
+import org.sonar.server.ws.WsAction;
 
 /**
  * Marker interface for quality profile related web service end points
  */
-public interface BaseQProfileWsAction extends RequestHandler, Definable<WebService.NewController> {
+public interface BaseQProfileWsAction extends WsAction {
 
   // Marker interface
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesAction.java
index 6d612f247fa..e6302ed4b58 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesAction.java
@@ -19,15 +19,13 @@
  */
 package org.sonar.server.rule.ws;
 
-import org.sonar.api.server.ws.Definable;
-import org.sonar.api.server.ws.RequestHandler;
-import org.sonar.api.server.ws.WebService;
+import org.sonar.server.ws.WsAction;
 
 /**
  * Marker interface for coding rule related actions
  *
  */
-interface RulesAction extends RequestHandler, Definable<WebService.NewController> {
+interface RulesAction extends WsAction {
 
   // Marker interface
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesAction.java
index 4a2de04d367..3db6f99e0c4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesAction.java
@@ -20,11 +20,9 @@
 
 package org.sonar.server.source.ws;
 
-import org.sonar.api.server.ws.Definable;
-import org.sonar.api.server.ws.RequestHandler;
-import org.sonar.api.server.ws.WebService;
+import org.sonar.server.ws.WsAction;
 
-public interface SourcesAction extends RequestHandler, Definable<WebService.NewController> {
+public interface SourcesAction extends WsAction {
 
   // Marker interface
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/WsAction.java b/server/sonar-server/src/main/java/org/sonar/server/ws/WsAction.java
new file mode 100644
index 00000000000..bb5aff54ef8
--- /dev/null
+++ b/server/sonar-server/src/main/java/org/sonar/server/ws/WsAction.java
@@ -0,0 +1,32 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube 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.
+ *
+ * SonarQube 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.ws;
+
+import org.sonar.api.server.ws.Definable;
+import org.sonar.api.server.ws.RequestHandler;
+import org.sonar.api.server.ws.WebService;
+
+/**
+ * Since 5.2, this interface is the base for Web Service marker interfaces
+ */
+public interface WsAction extends RequestHandler, Definable<WebService.NewController> {
+
+  // Marker interface
+}