Remove dead code

diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/ws/SearchOptions.java b/server/sonar-server/src/main/java/org/sonar/server/search/ws/SearchOptions.java
deleted file mode 100644 (file)
index 9dd44f9..0000000
--- a/server/sonar-server/src/main/java/org/sonar/server/search/ws/SearchOptions.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * 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.search.ws;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
-import org.sonar.api.server.ws.Request;
-import org.sonar.api.server.ws.WebService;
-import org.sonar.api.utils.text.JsonWriter;
-import org.sonar.server.search.QueryContext;
-import org.sonar.server.search.Result;
-
-/**
- * Generic options for search web services
- */
-@Deprecated
-public class SearchOptions {
-
-  private int pageSize;
-  private int page;
-  private List<String> fields;
-
-  public static SearchOptions create(Request request) {
-    SearchOptions options = new SearchOptions();
-
-    // both parameters have default values
-    options.setPage(request.mandatoryParamAsInt(WebService.Param.PAGE));
-    options.setPageSize(request.mandatoryParamAsInt(WebService.Param.PAGE_SIZE));
-
-    // optional field
-    options.setFields(request.paramAsStrings(WebService.Param.FIELDS));
-
-    return options;
-  }
-
-  public int pageSize() {
-    return pageSize;
-  }
-
-  public void setPageSize(int pageSize) {
-    this.pageSize = pageSize;
-  }
-
-  /**
-   * 1-based page id
-   */
-  public int page() {
-    return page;
-  }
-
-  public void setPage(int page) {
-    this.page = page;
-  }
-
-  /**
-   * The fields to be returned in JSON response. <code>null</code> means that
-   * all the fields must be returned.
-   */
-  @CheckForNull
-  public List<String> fields() {
-    return fields;
-  }
-
-  public SearchOptions setFields(@Nullable List<String> fields) {
-    this.fields = fields;
-    return this;
-  }
-
-  public boolean hasField(String key) {
-    return fields == null || fields.contains(key);
-  }
-
-  public SearchOptions writeStatistics(JsonWriter json, Result searchResult) {
-    json.prop("total", searchResult.getTotal());
-    json.prop(WebService.Param.PAGE, page);
-    json.prop(WebService.Param.PAGE_SIZE, pageSize);
-    return this;
-  }
-
-  public static void defineFieldsParam(WebService.NewAction action, @Nullable Collection<String> possibleFields) {
-    WebService.NewParam newParam = action
-      .createParam(WebService.Param.FIELDS)
-      .setDescription("Comma-separated list of the fields to be returned in response. All the fields are returned by default.")
-      .setPossibleValues(possibleFields);
-    if (possibleFields != null && possibleFields.size() > 1) {
-      Iterator<String> it = possibleFields.iterator();
-      newParam.setExampleValue(String.format("%s,%s", it.next(), it.next()));
-    }
-  }
-
-  public static void definePageParams(WebService.NewAction action) {
-    action
-      .createParam(WebService.Param.PAGE)
-      .setDescription("1-based page number")
-      .setExampleValue("42")
-      .setDefaultValue("1");
-
-    action
-      .createParam(WebService.Param.PAGE_SIZE)
-      .setDescription("Page size. Must be greater than 0.")
-      .setExampleValue("20")
-      .setDefaultValue(String.valueOf(QueryContext.DEFAULT_LIMIT));
-  }
-}

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceTest.java
deleted file mode 100644 (file)
index 9124b2f..0000000
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceTest.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * 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.issue;
-
-public class IssueBulkChangeServiceTest {
-
-//  DbClient dbClient = mock(DbClient.class);
-//  DbSession dbSession = mock(DbSession.class);
-//
-//  IssueDao issueDao = mock(IssueDao.class);
-//  IssueService issueService = mock(IssueService.class);
-//  IssueStorage issueStorage = mock(IssueStorage.class);
-//  DefaultRuleFinder ruleFinder = mock(DefaultRuleFinder.class);
-//  ComponentDao componentDao = mock(ComponentDao.class);
-//  NotificationManager notificationService = mock(NotificationManager.class);
-//
-//  IssueBulkChangeService service;
-//
-//  UserSession userSession = new MockUserSession("john").setUserId(10);
-//
-//  IssueDoc issue;
-//  Rule rule;
-//  ComponentDto project;
-//  ComponentDto file;
-//
-//  List<Action> actions;
-//
-//  @Before
-//  public void before() {
-//    when(dbClient.openSession(false)).thenReturn(dbSession);
-//    when(dbClient.componentDao()).thenReturn(componentDao);
-//    when(dbClient.issueDao()).thenReturn(issueDao);
-//
-//    rule = Rule.create("repo", "key").setName("the rule name");
-//    when(ruleFinder.findByKeys(newHashSet(rule.ruleKey()))).thenReturn(newArrayList(rule));
-//
-//    project = new ComponentDto()
-//      .setId(1L)
-//      .setKey("MyProject")
-//      .setLongName("My Project")
-//      .setQualifier(Qualifiers.PROJECT)
-//      .setScope(Scopes.PROJECT);
-//    when(componentDao.selectByKeys(dbSession, newHashSet(project.key()))).thenReturn(newArrayList(project));
-//
-//    file = new ComponentDto()
-//      .setId(2L)
-//      .setParentProjectId(project.getId())
-//      .setKey("MyComponent")
-//      .setLongName("My Component");
-//    when(componentDao.selectByKeys(dbSession, newHashSet(file.key()))).thenReturn(newArrayList(file));
-//
-//    IssueDoc issueDto = IssueTesting.newDoc("ABCD", file).setRuleKey(rule.ruleKey().toString());
-//    issue = issueDto.toDefaultIssue();
-//
-//    SearchResult<IssueDoc> result = mock(SearchResult.class);
-//    when(result.getDocs()).thenReturn(newArrayList((IssueDoc) issue));
-//    when(issueService.search(any(IssueQuery.class), any(SearchOptions.class))).thenReturn(result);
-//    when(issueDao.selectByKeys(dbSession, newArrayList(issue.key()))).thenReturn(newArrayList(issueDto));
-//
-//    actions = newArrayList();
-//    service = new IssueBulkChangeService(dbClient, issueService, issueStorage, ruleFinder, notificationService, actions);
-//  }
-//
-//  @Test
-//  public void should_execute_bulk_change() {
-//    Map<String, Object> properties = newHashMap();
-//    properties.put("issues", "ABCD");
-//    properties.put("actions", "assign");
-//    properties.put("assign.assignee", "fred");
-//    actions.add(new MockAction("assign"));
-//
-//    IssueBulkChangeQuery issueBulkChangeQuery = new IssueBulkChangeQuery(properties, true);
-//    IssueBulkChangeResult result = service.execute(issueBulkChangeQuery, userSession);
-//    assertThat(result.issuesChanged()).hasSize(1);
-//    assertThat(result.issuesNotChanged()).isEmpty();
-//
-//    verify(issueStorage).save(eq(issue));
-//    verifyNoMoreInteractions(issueStorage);
-//    verify(notificationService).scheduleForSending(any(IssueChangeNotification.class));
-//    verifyNoMoreInteractions(notificationService);
-//  }
-//
-//  @Test
-//  public void should_skip_send_notifications() {
-//    Map<String, Object> properties = newHashMap();
-//    properties.put("issues", "ABCD");
-//    properties.put("actions", "assign");
-//    properties.put("assign.assignee", "fred");
-//    actions.add(new MockAction("assign"));
-//
-//    IssueBulkChangeQuery issueBulkChangeQuery = new IssueBulkChangeQuery(properties, false);
-//    IssueBulkChangeResult result = service.execute(issueBulkChangeQuery, userSession);
-//    assertThat(result.issuesChanged()).hasSize(1);
-//    assertThat(result.issuesNotChanged()).isEmpty();
-//
-//    verify(issueStorage).save(eq(issue));
-//    verifyNoMoreInteractions(issueStorage);
-//    verifyZeroInteractions(notificationService);
-//  }
-//
-//  @Test
-//  public void should_execute_bulk_change_with_comment() {
-//    Map<String, Object> properties = newHashMap();
-//    properties.put("issues", "ABCD");
-//    properties.put("actions", "assign");
-//    properties.put("assign.assignee", "fred");
-//
-//    Action commentAction = mock(Action.class);
-//    when(commentAction.key()).thenReturn("comment");
-//    when(commentAction.supports(any(Issue.class))).thenReturn(true);
-//    when(commentAction.verify(anyMap(), anyListOf(Issue.class), any(UserSession.class))).thenReturn(true);
-//    when(commentAction.execute(anyMap(), any(IssueBulkChangeService.ActionContext.class))).thenReturn(true);
-//    actions.add(commentAction);
-//    actions.add(new MockAction("assign"));
-//
-//    IssueBulkChangeQuery issueBulkChangeQuery = new IssueBulkChangeQuery(properties, "my comment", true);
-//    IssueBulkChangeResult result = service.execute(issueBulkChangeQuery, userSession);
-//    assertThat(result.issuesChanged()).hasSize(1);
-//    assertThat(result.issuesNotChanged()).isEmpty();
-//
-//    verify(commentAction).execute(anyMap(), any(IssueBulkChangeService.ActionContext.class));
-//    verify(issueStorage).save(eq(issue));
-//  }
-//
-//  @Test
-//  public void should_execute_bulk_change_with_comment_only_on_changed_issues() {
-//    IssueDto issueDto1 = IssueTesting.newDto(RuleTesting.newDto(rule.ruleKey()).setId(50), file, project).setUuid("ABCD");
-//    IssueDto issueDto2 = IssueTesting.newDto(RuleTesting.newDto(rule.ruleKey()).setId(50), file, project).setUuid("EFGH");
-//
-//    org.sonar.server.search.Result<Issue> resultIssues = mock(org.sonar.server.search.Result.class);
-//    when(resultIssues.getHits()).thenReturn(Lists.<Issue>newArrayList(issueDto1.toDefaultIssue(), issueDto2.toDefaultIssue()));
-//    when(issueService.search(any(IssueQuery.class), any(QueryContext.class))).thenReturn(resultIssues);
-//    when(issueDao.selectByKeys(dbSession, newArrayList("ABCD", "EFGH"))).thenReturn(newArrayList(issueDto1, issueDto2));
-//
-//    Map<String, Object> properties = newHashMap();
-//    properties.put("issues", "ABCD,EFGH");
-//    properties.put("actions", "assign");
-//    properties.put("assign.assignee", "fred");
-//
-//    Action commentAction = mock(Action.class);
-//    when(commentAction.key()).thenReturn("comment");
-//    when(commentAction.supports(any(Issue.class))).thenReturn(true);
-//    when(commentAction.verify(anyMap(), anyListOf(Issue.class), any(UserSession.class))).thenReturn(true);
-//    when(commentAction.execute(anyMap(), any(IssueBulkChangeService.ActionContext.class))).thenReturn(true);
-//    actions.add(commentAction);
-//
-//    // This action will only be executed on the first issue, not the second
-//    Action assignAction = mock(Action.class);
-//    when(assignAction.key()).thenReturn("assign");
-//    when(assignAction.supports(any(Issue.class))).thenReturn(true).thenReturn(false);
-//    when(assignAction.verify(anyMap(), anyListOf(Issue.class), any(UserSession.class))).thenReturn(true);
-//    when(assignAction.execute(anyMap(), any(IssueBulkChangeService.ActionContext.class))).thenReturn(true).thenReturn(false);
-//    actions.add(assignAction);
-//
-//    IssueBulkChangeQuery issueBulkChangeQuery = new IssueBulkChangeQuery(properties, "my comment", true);
-//    IssueBulkChangeResult result = service.execute(issueBulkChangeQuery, userSession);
-//    assertThat(result.issuesChanged()).hasSize(1);
-//    assertThat(result.issuesNotChanged()).hasSize(1);
-//
-//    // Only one issue will receive the comment
-//    verify(assignAction, times(1)).execute(anyMap(), any(IssueBulkChangeService.ActionContext.class));
-//    verify(issueStorage).save(eq(issueDto1.toDefaultIssue()));
-//  }
-//
-//  @Test
-//  public void should_save_once_per_issue() {
-//    Map<String, Object> properties = newHashMap();
-//    properties.put("issues", "ABCD");
-//    properties.put("actions", "assign,set_severity");
-//    properties.put("assign.assignee", "fred");
-//    properties.put("set_severity.severity", "MINOR");
-//
-//    actions.add(new MockAction("set_severity"));
-//    actions.add(new MockAction("assign"));
-//
-//    IssueBulkChangeQuery issueBulkChangeQuery = new IssueBulkChangeQuery(properties, true);
-//    IssueBulkChangeResult result = service.execute(issueBulkChangeQuery, userSession);
-//    assertThat(result.issuesChanged()).hasSize(1);
-//    assertThat(result.issuesNotChanged()).isEmpty();
-//
-//    verify(issueStorage, times(1)).save(eq(issue));
-//    verifyNoMoreInteractions(issueStorage);
-//    verify(notificationService).scheduleForSending(any(IssueChangeNotification.class));
-//    verifyNoMoreInteractions(notificationService);
-//  }
-//
-//  @Test
-//  public void should_not_execute_bulk_if_issue_does_not_support_action() {
-//    Map<String, Object> properties = newHashMap();
-//    properties.put("issues", "ABCD");
-//    properties.put("actions", "assign");
-//    properties.put("assign.assignee", "fred");
-//    actions.add(new MockAction("assign", true, true, false));
-//
-//    IssueBulkChangeQuery issueBulkChangeQuery = new IssueBulkChangeQuery(properties, true);
-//    IssueBulkChangeResult result = service.execute(issueBulkChangeQuery, userSession);
-//    assertThat(result.issuesChanged()).isEmpty();
-//    assertThat(result.issuesNotChanged()).hasSize(1);
-//
-//    verifyZeroInteractions(issueStorage);
-//    verifyZeroInteractions(notificationService);
-//  }
-//
-//  @Test
-//  public void should_not_execute_bulk_if_action_is_not_verified() {
-//    Map<String, Object> properties = newHashMap();
-//    properties.put("issues", "ABCD");
-//    properties.put("actions", "assign");
-//    properties.put("assign.assignee", "fred");
-//    actions.add(new MockAction("assign", false, true, true));
-//
-//    IssueBulkChangeQuery issueBulkChangeQuery = new IssueBulkChangeQuery(properties, true);
-//    IssueBulkChangeResult result = service.execute(issueBulkChangeQuery, userSession);
-//    assertThat(result.issuesChanged()).isEmpty();
-//    assertThat(result.issuesNotChanged()).isEmpty();
-//
-//    verifyZeroInteractions(issueStorage);
-//    verifyZeroInteractions(notificationService);
-//  }
-//
-//  @Test
-//  public void should_not_execute_bulk_if_action_could_not_be_executed_on_issue() {
-//    Map<String, Object> properties = newHashMap();
-//    properties.put("issues", "ABCD");
-//    properties.put("actions", "assign");
-//    properties.put("assign.assignee", "fred");
-//    actions.add(new MockAction("assign", true, false, true));
-//
-//    IssueBulkChangeQuery issueBulkChangeQuery = new IssueBulkChangeQuery(properties, true);
-//    IssueBulkChangeResult result = service.execute(issueBulkChangeQuery, userSession);
-//    assertThat(result.issuesChanged()).isEmpty();
-//    assertThat(result.issuesNotChanged()).hasSize(1);
-//
-//    verifyZeroInteractions(issueStorage);
-//    verifyZeroInteractions(notificationService);
-//  }
-//
-//  @Test
-//  public void should_not_execute_bulk_on_unexpected_error() {
-//    Map<String, Object> properties = newHashMap();
-//    properties.put("issues", "ABCD");
-//    properties.put("actions", "assign");
-//    properties.put("assign.assignee", "fred");
-//
-//    Action action = mock(Action.class);
-//    when(action.key()).thenReturn("assign");
-//    when(action.supports(any(Issue.class))).thenReturn(true);
-//    when(action.verify(anyMap(), anyListOf(Issue.class), any(UserSession.class))).thenReturn(true);
-//    doThrow(new RuntimeException("Error")).when(action).execute(anyMap(), any(IssueBulkChangeService.ActionContext.class));
-//    actions.add(action);
-//
-//    IssueBulkChangeQuery issueBulkChangeQuery = new IssueBulkChangeQuery(properties, true);
-//    IssueBulkChangeResult result = service.execute(issueBulkChangeQuery, userSession);
-//    assertThat(result.issuesChanged()).isEmpty();
-//    assertThat(result.issuesNotChanged()).hasSize(1);
-//
-//    verifyZeroInteractions(issueStorage);
-//    verifyZeroInteractions(notificationService);
-//  }
-//
-//  @Test
-//  public void should_fail_if_user_not_logged() {
-//    userSession = MockUserSession.create().setLogin(null);
-//
-//    Map<String, Object> properties = newHashMap();
-//    properties.put("issues", "ABCD");
-//    properties.put("actions", "assign");
-//    properties.put("assign.assignee", "fred");
-//    IssueBulkChangeQuery issueBulkChangeQuery = new IssueBulkChangeQuery(properties, true);
-//    try {
-//      service.execute(issueBulkChangeQuery, userSession);
-//      fail();
-//    } catch (Exception e) {
-//      assertThat(e).isInstanceOf(UnauthorizedException.class);
-//    }
-//    verifyZeroInteractions(issueStorage);
-//    verifyZeroInteractions(notificationService);
-//  }
-//
-//  @Test
-//  public void should_fail_if_action_not_found() {
-//    Map<String, Object> properties = newHashMap();
-//    properties.put("issues", "ABCD");
-//    properties.put("actions", "unknown");
-//    properties.put("unknown.unknown", "unknown");
-//    IssueBulkChangeQuery issueBulkChangeQuery = new IssueBulkChangeQuery(properties, true);
-//    try {
-//      service.execute(issueBulkChangeQuery, userSession);
-//      fail();
-//    } catch (Exception e) {
-//      assertThat(e).isInstanceOf(BadRequestException.class).hasMessage("The action : 'unknown' is unknown");
-//    }
-//    verifyZeroInteractions(issueStorage);
-//    verifyZeroInteractions(notificationService);
-//  }
-//
-//  class MockAction extends Action {
-//
-//    private boolean verify;
-//    private boolean execute;
-//
-//    public MockAction(String key, boolean verify, boolean execute, final boolean support) {
-//      super(key);
-//      this.verify = verify;
-//      this.execute = execute;
-//      setConditions(new Condition() {
-//        @Override
-//        public boolean matches(Issue issue) {
-//          return support;
-//        }
-//      });
-//    }
-//
-//    public MockAction(String key) {
-//      this(key, true, true, true);
-//    }
-//
-//    @Override
-//    boolean verify(Map<String, Object> properties, List<Issue> issues, UserSession userSession) {
-//      return verify;
-//    }
-//
-//    @Override
-//    boolean execute(Map<String, Object> properties, Context context) {
-//      return execute;
-//    }
-//  }
-}