@@ -83,7 +83,7 @@ import static org.sonarqube.ws.client.issue.IssuesWsParameters.PARAM_SINCE_LEAK_ | |||
* This component is used to create an IssueQuery, in order to transform the component and component roots keys into uuid. | |||
*/ | |||
@ServerSide | |||
public class IssueQueryService { | |||
public class IssueQueryFactory { | |||
public static final String LOGIN_MYSELF = "__me__"; | |||
@@ -93,7 +93,7 @@ public class IssueQueryService { | |||
private final System2 system; | |||
private final UserSession userSession; | |||
public IssueQueryService(DbClient dbClient, ComponentService componentService, System2 system, UserSession userSession) { | |||
public IssueQueryFactory(DbClient dbClient, ComponentService componentService, System2 system, UserSession userSession) { | |||
this.dbClient = dbClient; | |||
this.componentService = componentService; | |||
this.system = system; |
@@ -29,7 +29,7 @@ import org.sonar.api.server.ws.WebService; | |||
import org.sonar.api.server.ws.WebService.NewAction; | |||
import org.sonar.api.utils.text.JsonWriter; | |||
import org.sonar.server.issue.IssueQuery; | |||
import org.sonar.server.issue.IssueQueryService; | |||
import org.sonar.server.issue.IssueQueryFactory; | |||
import org.sonar.server.issue.IssueService; | |||
import org.sonarqube.ws.client.issue.IssuesWsParameters; | |||
@@ -45,9 +45,9 @@ import static org.sonarqube.ws.client.issue.IssuesWsParameters.PARAM_CREATED_AFT | |||
public class ComponentTagsAction implements IssuesWsAction { | |||
private final IssueService service; | |||
private final IssueQueryService queryService; | |||
private final IssueQueryFactory queryService; | |||
public ComponentTagsAction(IssueService service, IssueQueryService queryService) { | |||
public ComponentTagsAction(IssueService service, IssueQueryFactory queryService) { | |||
this.service = service; | |||
this.queryService = queryService; | |||
} |
@@ -23,7 +23,7 @@ import org.sonar.core.platform.Module; | |||
import org.sonar.server.issue.ActionFinder; | |||
import org.sonar.server.issue.IssueFieldsSetter; | |||
import org.sonar.server.issue.IssueFinder; | |||
import org.sonar.server.issue.IssueQueryService; | |||
import org.sonar.server.issue.IssueQueryFactory; | |||
import org.sonar.server.issue.IssueService; | |||
import org.sonar.server.issue.IssueUpdater; | |||
import org.sonar.server.issue.ServerIssueStorage; | |||
@@ -45,7 +45,7 @@ public class IssueWsModule extends Module { | |||
FunctionExecutor.class, | |||
IssueWorkflow.class, | |||
IssueService.class, | |||
IssueQueryService.class, | |||
IssueQueryFactory.class, | |||
IssuesWs.class, | |||
AvatarFactoryImpl.class, | |||
SearchResponseLoader.class, |
@@ -42,7 +42,7 @@ import org.sonar.server.es.Facets; | |||
import org.sonar.server.es.SearchOptions; | |||
import org.sonar.server.es.SearchResult; | |||
import org.sonar.server.issue.IssueQuery; | |||
import org.sonar.server.issue.IssueQueryService; | |||
import org.sonar.server.issue.IssueQueryFactory; | |||
import org.sonar.server.issue.index.IssueDoc; | |||
import org.sonar.server.issue.index.IssueIndex; | |||
import org.sonar.server.user.UserSession; | |||
@@ -103,15 +103,15 @@ public class SearchAction implements IssuesWsAction { | |||
private final UserSession userSession; | |||
private final IssueIndex issueIndex; | |||
private final IssueQueryService issueQueryService; | |||
private final IssueQueryFactory issueQueryFactory; | |||
private final SearchResponseLoader searchResponseLoader; | |||
private final SearchResponseFormat searchResponseFormat; | |||
public SearchAction(UserSession userSession, IssueIndex issueIndex, IssueQueryService issueQueryService, | |||
public SearchAction(UserSession userSession, IssueIndex issueIndex, IssueQueryFactory issueQueryFactory, | |||
SearchResponseLoader searchResponseLoader, SearchResponseFormat searchResponseFormat) { | |||
this.userSession = userSession; | |||
this.issueIndex = issueIndex; | |||
this.issueQueryService = issueQueryService; | |||
this.issueQueryFactory = issueQueryFactory; | |||
this.searchResponseLoader = searchResponseLoader; | |||
this.searchResponseFormat = searchResponseFormat; | |||
} | |||
@@ -305,7 +305,7 @@ public class SearchAction implements IssuesWsAction { | |||
// prepare the Elasticsearch request | |||
SearchOptions options = createSearchOptionsFromRequest(request); | |||
EnumSet<SearchAdditionalField> additionalFields = SearchAdditionalField.getFromRequest(request); | |||
IssueQuery query = issueQueryService.createFromRequest(request); | |||
IssueQuery query = issueQueryFactory.createFromRequest(request); | |||
// execute request | |||
SearchResult<IssueDoc> result = issueIndex.search(query, options); | |||
@@ -371,7 +371,7 @@ public class SearchAction implements IssuesWsAction { | |||
List<String> assigneesFromRequest = request.getAssignees(); | |||
if (assigneesFromRequest != null) { | |||
assignees.addAll(assigneesFromRequest); | |||
assignees.remove(IssueQueryService.LOGIN_MYSELF); | |||
assignees.remove(IssueQueryFactory.LOGIN_MYSELF); | |||
} | |||
addMandatoryValuesToFacet(facets, PARAM_ASSIGNEES, assignees); | |||
addMandatoryValuesToFacet(facets, FACET_ASSIGNED_TO_ME, singletonList(userSession.getLogin())); | |||
@@ -394,7 +394,7 @@ public class SearchAction implements IssuesWsAction { | |||
return; | |||
} | |||
requestParams.stream() | |||
.filter(param -> !buckets.containsKey(param) && !IssueQueryService.LOGIN_MYSELF.equals(param)) | |||
.filter(param -> !buckets.containsKey(param) && !IssueQueryFactory.LOGIN_MYSELF.equals(param)) | |||
// Prevent appearance of a glitch value due to dedicated parameter for this facet | |||
.forEach(param -> buckets.put(param, 0L)); | |||
}); |
@@ -46,7 +46,7 @@ import static org.junit.Assert.fail; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.when; | |||
public class IssueQueryServiceTest { | |||
public class IssueQueryFactoryTest { | |||
@Rule | |||
public UserSessionRule userSession = UserSessionRule.standalone(); | |||
@@ -57,7 +57,7 @@ public class IssueQueryServiceTest { | |||
private ComponentService componentService = new ComponentService(db.getDbClient(), userSession); | |||
private System2 system = mock(System2.class); | |||
private IssueQueryService underTest = new IssueQueryService(db.getDbClient(), componentService, system, userSession); | |||
private IssueQueryFactory underTest = new IssueQueryFactory(db.getDbClient(), componentService, system, userSession); | |||
@Test | |||
public void create_from_parameters() { | |||
@@ -137,11 +137,11 @@ public class IssueQueryServiceTest { | |||
@Test | |||
public void parse_list_of_rules() { | |||
assertThat(IssueQueryService.toRules(null)).isNull(); | |||
assertThat(IssueQueryService.toRules("")).isEmpty(); | |||
assertThat(IssueQueryService.toRules("squid:AvoidCycle")).containsOnly(RuleKey.of("squid", "AvoidCycle")); | |||
assertThat(IssueQueryService.toRules("squid:AvoidCycle,findbugs:NullRef")).containsOnly(RuleKey.of("squid", "AvoidCycle"), RuleKey.of("findbugs", "NullRef")); | |||
assertThat(IssueQueryService.toRules(asList("squid:AvoidCycle", "findbugs:NullRef"))).containsOnly(RuleKey.of("squid", "AvoidCycle"), RuleKey.of("findbugs", "NullRef")); | |||
assertThat(IssueQueryFactory.toRules(null)).isNull(); | |||
assertThat(IssueQueryFactory.toRules("")).isEmpty(); | |||
assertThat(IssueQueryFactory.toRules("squid:AvoidCycle")).containsOnly(RuleKey.of("squid", "AvoidCycle")); | |||
assertThat(IssueQueryFactory.toRules("squid:AvoidCycle,findbugs:NullRef")).containsOnly(RuleKey.of("squid", "AvoidCycle"), RuleKey.of("findbugs", "NullRef")); | |||
assertThat(IssueQueryFactory.toRules(asList("squid:AvoidCycle", "findbugs:NullRef"))).containsOnly(RuleKey.of("squid", "AvoidCycle"), RuleKey.of("findbugs", "NullRef")); | |||
} | |||
@Test |
@@ -30,7 +30,7 @@ import org.mockito.runners.MockitoJUnitRunner; | |||
import org.sonar.api.server.ws.WebService.Action; | |||
import org.sonar.api.server.ws.WebService.Param; | |||
import org.sonar.server.issue.IssueQuery; | |||
import org.sonar.server.issue.IssueQueryService; | |||
import org.sonar.server.issue.IssueQueryFactory; | |||
import org.sonar.server.issue.IssueService; | |||
import org.sonar.server.ws.WsTester; | |||
@@ -46,7 +46,7 @@ public class ComponentTagsActionTest { | |||
private IssueService service; | |||
@Mock | |||
private IssueQueryService queryService; | |||
private IssueQueryFactory queryService; | |||
private ComponentTagsAction componentTagsAction; | |||
@@ -23,7 +23,7 @@ import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.junit.rules.ExpectedException; | |||
import org.sonar.api.server.ws.WebService; | |||
import org.sonar.server.issue.IssueQueryService; | |||
import org.sonar.server.issue.IssueQueryFactory; | |||
import org.sonar.server.issue.index.IssueIndex; | |||
import org.sonar.server.tester.UserSessionRule; | |||
import org.sonar.server.ws.WsActionTester; | |||
@@ -40,10 +40,10 @@ public class SearchActionTest { | |||
public UserSessionRule userSession = UserSessionRule.standalone(); | |||
private IssueIndex index = mock(IssueIndex.class); | |||
private IssueQueryService issueQueryService = mock(IssueQueryService.class); | |||
private IssueQueryFactory issueQueryFactory = mock(IssueQueryFactory.class); | |||
private SearchResponseLoader searchResponseLoader = mock(SearchResponseLoader.class); | |||
private SearchResponseFormat searchResponseFormat = mock(SearchResponseFormat.class); | |||
private SearchAction underTest = new SearchAction(userSession, index, issueQueryService, searchResponseLoader, searchResponseFormat); | |||
private SearchAction underTest = new SearchAction(userSession, index, issueQueryFactory, searchResponseLoader, searchResponseFormat); | |||
private WsActionTester wsTester = new WsActionTester(underTest); | |||
@Test |