From efcae62c18cb8e07587acc9f62bd55bb4c015c5c Mon Sep 17 00:00:00 2001
From: Teryk Bellahsene <teryk.bellahsene@sonarsource.com>
Date: Fri, 2 Oct 2015 16:58:47 +0200
Subject: [PATCH] SONAR-6314 Delete RoR WS api/profiles/restore

---
 .../server/qualityprofile/ws/ProfilesWs.java     | 14 --------------
 .../server/qualityprofile/ws/ProfilesWsTest.java | 12 +-----------
 .../app/controllers/api/profiles_controller.rb   | 16 ----------------
 3 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProfilesWs.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProfilesWs.java
index 0b24b35d01c..76c57de8b96 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProfilesWs.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProfilesWs.java
@@ -34,7 +34,6 @@ public class ProfilesWs implements WebService {
       .setDescription("Former quality profiles web service");
 
     defineBackupAction(controller);
-    defineRestoreAction(controller);
 
     controller.done();
   }
@@ -55,17 +54,4 @@ public class ProfilesWs implements WebService {
       .setExampleValue("Sonar way");
     RailsHandler.addFormatParam(action);
   }
-
-  private static void defineRestoreAction(NewController controller) {
-    WebService.NewAction action = controller.createAction("restore")
-      .setDescription("Restore a quality profile backup. Requires Administer Quality Profiles permission")
-      .setSince("3.1")
-      .setPost(true)
-      .setHandler(RailsHandler.INSTANCE);
-
-    action.createParam("backup")
-      .setRequired(true)
-      .setDescription("Path to the file containing the backup (HTML format)");
-    RailsHandler.addJsonOnlyFormatParam(action);
-  }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProfilesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProfilesWsTest.java
index 78cb5ff6802..3f77ff988e4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProfilesWsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProfilesWsTest.java
@@ -46,7 +46,7 @@ public class ProfilesWsTest {
     assertThat(controller).isNotNull();
     assertThat(controller.path()).isEqualTo("api/profiles");
     assertThat(controller.description()).isNotEmpty();
-    assertThat(controller.actions()).hasSize(2);
+    assertThat(controller.actions()).hasSize(1);
   }
 
   @Test
@@ -58,14 +58,4 @@ public class ProfilesWsTest {
     assertThat(restoreProfiles.handler()).isInstanceOf(RailsHandler.class);
     assertThat(restoreProfiles.params()).hasSize(3);
   }
-
-  @Test
-  public void define_restore_action() {
-    WebService.Controller controller = tester.controller("api/profiles");
-
-    WebService.Action restoreProfiles = controller.action("restore");
-    assertThat(restoreProfiles).isNotNull();
-    assertThat(restoreProfiles.handler()).isInstanceOf(RailsHandler.class);
-    assertThat(restoreProfiles.params()).hasSize(2);
-  }
 }
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/profiles_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/profiles_controller.rb
index 694c84dd744..87c2ab7151a 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/profiles_controller.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/profiles_controller.rb
@@ -42,22 +42,6 @@ class Api::ProfilesController < Api::ApiController
     end
   end
 
-  # Restore a profile backup.
-  # curl -X POST -u admin:admin -F 'backup=<my>backup</my>' -v http://localhost:9000/api/profiles/restore
-  # curl -X POST -u admin:admin -F 'backup=@backup.xml' -v http://localhost:9000/api/profiles/restore
-  def restore
-    verify_post_request
-    require_parameters :backup
-
-    backup = Api::Utils.read_post_request_param(params[:backup])
-    Internal.component(Java::OrgSonarServerQualityprofile::QProfileService.java_class).restore(backup)
-
-    respond_to do |format|
-      #TODO format.json { render :json => jsonp(validation_result_to_json(result)), :status => 200 }
-      format.json { render :json => jsonp({}), :status => 200 }
-    end
-  end
-
   private
 
   def validation_messages_to_json(messages)
-- 
2.39.5