Skip to content

Commit 874bc62

Browse files
author
psantos1113
authored
Merge pull request #58 from blackducksoftware/dev/ps/IALERT-3548-filter-by-key
IALERT-3548: Add filtering by key to search.
2 parents 0aafa15 + 7b53977 commit 874bc62

File tree

5 files changed

+21
-15
lines changed

5 files changed

+21
-15
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
.gradle
33
build
44
out/
5+
bin/
56
**/test.properties

‎src/main/java/com/synopsys/integration/jira/common/cloud/service/IssueService.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.util.HashMap;
1111
import java.util.List;
1212
import java.util.Map;
13+
import java.util.function.Predicate;
1314
import java.util.stream.Collectors;
1415

1516
import javax.annotation.Nullable;
@@ -69,11 +70,12 @@ public IssueCreationResponseModel createIssue(IssueCreationRequestModel requestM
6970
String issueTypeName = StringUtils.trim(requestModel.getIssueTypeName());
7071
String projectName = StringUtils.trim(requestModel.getProjectName());
7172
String reporterEmail = StringUtils.trim(requestModel.getReporterEmail());
72-
73+
Predicate<ProjectComponent> nameMatchPredicate = projectComponent -> projectComponent.getName().equalsIgnoreCase(projectName);
74+
Predicate<ProjectComponent> keyMatchPredicate = projectComponent -> projectComponent.getKey().equalsIgnoreCase(projectName);
7375
PageOfProjectsResponseModel pageOfProjects = projectService.getProjectsByName(projectName);
7476
String projectId = pageOfProjects.getProjects()
7577
.stream()
76-
.filter(projectComponent -> projectComponent.getName().equals(projectName))
78+
.filter(nameMatchPredicate.or(keyMatchPredicate))
7779
.findFirst()
7880
.map(ProjectComponent::getId)
7981
.orElseThrow(() -> new JiraPreconditionNotMetException(String.format("Project not found; project name: %s", projectName)));

‎src/main/java/com/synopsys/integration/jira/common/server/service/IssueService.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.util.HashMap;
1212
import java.util.List;
1313
import java.util.Map;
14+
import java.util.function.Predicate;
1415

1516
import org.apache.commons.lang3.StringUtils;
1617

@@ -65,6 +66,8 @@ public IssueCreationResponseModel createIssue(IssueCreationRequestModel requestM
6566
String issueTypeName = StringUtils.trim(requestModel.getIssueTypeName());
6667
String projectName = StringUtils.trim(requestModel.getProjectName());
6768
String reporter = StringUtils.trim(requestModel.getReporterUsername());
69+
Predicate<ProjectComponent> nameMatchPredicate = issueTypeResponseModel -> issueTypeResponseModel.getName().equalsIgnoreCase(projectName);
70+
Predicate<ProjectComponent> keyMatchPredicate = issueTypeResponseModel -> issueTypeResponseModel.getKey().equalsIgnoreCase(projectName);
6871

6972
IssueTypeResponseModel foundIssueType = issueTypeService.getAllIssueTypes().stream()
7073
.filter(issueType -> issueType.getName().equalsIgnoreCase(issueTypeName))
@@ -75,7 +78,7 @@ public IssueCreationResponseModel createIssue(IssueCreationRequestModel requestM
7578
.orElse("");
7679
List<ProjectComponent> projects = projectService.getProjectsByName(projectName);
7780
ProjectComponent foundProject = projects.stream()
78-
.filter(projectComponent -> projectComponent.getName().equals(projectName))
81+
.filter(nameMatchPredicate.or(keyMatchPredicate))
7982
.findFirst()
8083
.orElseThrow(() -> new JiraPreconditionNotMetException(String.format("Project not found; project name: %s", projectName)));
8184

‎src/test/java/com/synopsys/integration/jira/common/cloud/service/IssueServiceTestIT.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@
3838
import com.synopsys.integration.jira.common.test.TestProperties;
3939
import com.synopsys.integration.jira.common.test.TestPropertyKey;
4040

41-
public class IssueServiceTestIT extends JiraCloudParameterizedTestIT {
41+
class IssueServiceTestIT extends JiraCloudParameterizedTestIT {
4242
private final TestProperties testProperties = TestProperties.loadTestProperties();
4343
private final String userEmail = testProperties.getProperty(TestPropertyKey.TEST_JIRA_CLOUD_EMAIL);
4444
private final String testProjectName = testProperties.getProperty(TestPropertyKey.TEST_JIRA_CLOUD_TEST_PROJECT_NAME);
4545
private final String jiraTestPropertyKey = testProperties.getProperty(TestPropertyKey.TEST_JIRA_CLOUD_TEST_PROPERTY_KEY);
4646

4747
@ParameterizedTest
4848
@MethodSource("getParameters")
49-
public void testCreateIssue(JiraHttpClient jiraHttpClient) throws Exception {
49+
void testCreateIssue(JiraHttpClient jiraHttpClient) throws Exception {
5050
JiraCloudServiceTestUtility.validateConfiguration();
5151
JiraCloudServiceFactory serviceFactory = JiraCloudServiceTestUtility.createServiceFactory(jiraHttpClient);
5252
IssueService issueService = serviceFactory.createIssueService();
@@ -65,7 +65,7 @@ public void testCreateIssue(JiraHttpClient jiraHttpClient) throws Exception {
6565

6666
@ParameterizedTest
6767
@MethodSource("getParameters")
68-
public void testCreateNullFieldExceptions(JiraHttpClient jiraHttpClient) throws Exception {
68+
void testCreateNullFieldExceptions(JiraHttpClient jiraHttpClient) throws Exception {
6969
JiraCloudServiceTestUtility.validateConfiguration();
7070
JiraCloudServiceFactory serviceFactory = JiraCloudServiceTestUtility.createServiceFactory(jiraHttpClient);
7171
IssueService issueService = serviceFactory.createIssueService();
@@ -99,7 +99,7 @@ public void testCreateNullFieldExceptions(JiraHttpClient jiraHttpClient) throws
9999

100100
@ParameterizedTest
101101
@MethodSource("getParameters")
102-
public void testCreateFieldsNotFoundExceptions(JiraHttpClient jiraHttpClient) throws Exception {
102+
void testCreateFieldsNotFoundExceptions(JiraHttpClient jiraHttpClient) throws Exception {
103103
JiraCloudServiceTestUtility.validateConfiguration();
104104
JiraCloudServiceFactory serviceFactory = JiraCloudServiceTestUtility.createServiceFactory(jiraHttpClient);
105105
IssueService issueService = serviceFactory.createIssueService();
@@ -138,7 +138,7 @@ public void testCreateFieldsNotFoundExceptions(JiraHttpClient jiraHttpClient) th
138138

139139
@ParameterizedTest
140140
@MethodSource("getParameters")
141-
public void testUpdateIssue(JiraHttpClient jiraHttpClient) throws Exception {
141+
void testUpdateIssue(JiraHttpClient jiraHttpClient) throws Exception {
142142
JiraCloudServiceTestUtility.validateConfiguration();
143143
JiraCloudServiceFactory serviceFactory = JiraCloudServiceTestUtility.createServiceFactory(jiraHttpClient);
144144
IssueService issueService = serviceFactory.createIssueService();
@@ -175,7 +175,7 @@ public void testUpdateIssue(JiraHttpClient jiraHttpClient) throws Exception {
175175

176176
@ParameterizedTest
177177
@MethodSource("getParameters")
178-
public void testAddComment(JiraHttpClient jiraHttpClient) throws Exception {
178+
void testAddComment(JiraHttpClient jiraHttpClient) throws Exception {
179179
JiraCloudServiceTestUtility.validateConfiguration();
180180
JiraCloudServiceFactory serviceFactory = JiraCloudServiceTestUtility.createServiceFactory(jiraHttpClient);
181181
IssueService issueService = serviceFactory.createIssueService();
@@ -199,7 +199,7 @@ public void testAddComment(JiraHttpClient jiraHttpClient) throws Exception {
199199

200200
@ParameterizedTest
201201
@MethodSource("getParameters")
202-
public void testGetStatus(JiraHttpClient jiraHttpClient) throws Exception {
202+
void testGetStatus(JiraHttpClient jiraHttpClient) throws Exception {
203203
JiraCloudServiceTestUtility.validateConfiguration();
204204
JiraCloudServiceFactory serviceFactory = JiraCloudServiceTestUtility.createServiceFactory(jiraHttpClient);
205205
IssueService issueService = serviceFactory.createIssueService();
@@ -219,7 +219,7 @@ public void testGetStatus(JiraHttpClient jiraHttpClient) throws Exception {
219219

220220
@ParameterizedTest
221221
@MethodSource("getParameters")
222-
public void testTransitionIssue(JiraHttpClient jiraHttpClient) throws Exception {
222+
void testTransitionIssue(JiraHttpClient jiraHttpClient) throws Exception {
223223
JiraCloudServiceTestUtility.validateConfiguration();
224224
JiraCloudServiceFactory serviceFactory = JiraCloudServiceTestUtility.createServiceFactory(jiraHttpClient);
225225
IssueService issueService = serviceFactory.createIssueService();

‎src/test/java/com/synopsys/integration/jira/common/server/IssueServiceTestIT.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929
import com.synopsys.integration.jira.common.test.TestProperties;
3030
import com.synopsys.integration.jira.common.test.TestPropertyKey;
3131

32-
public class IssueServiceTestIT extends JiraServerParameterizedTestIT {
32+
class IssueServiceTestIT extends JiraServerParameterizedTestIT {
3333
private final TestProperties testProperties = TestProperties.loadTestProperties();
3434
private final String projectName = testProperties.getProperty(TestPropertyKey.TEST_JIRA_SERVER_TEST_PROJECT_NAME);
3535
private final String reporter = testProperties.getProperty(TestPropertyKey.TEST_JIRA_SERVER_USERNAME);
3636
private final String issueTypeName = testProperties.getProperty(TestPropertyKey.TEST_JIRA_SERVER_ISSUE_TYPE);
3737

3838
@ParameterizedTest
3939
@MethodSource("getParameters")
40-
public void createIssueTest(JiraHttpClient jiraHttpClient) throws IntegrationException {
40+
void createIssueTest(JiraHttpClient jiraHttpClient) throws IntegrationException {
4141
JiraServerServiceTestUtility.validateConfiguration();
4242

4343
JiraServerServiceFactory serviceFactory = JiraServerServiceTestUtility.createServiceFactory(jiraHttpClient);
@@ -54,7 +54,7 @@ public void createIssueTest(JiraHttpClient jiraHttpClient) throws IntegrationExc
5454

5555
@ParameterizedTest
5656
@MethodSource("getParameters")
57-
public void createIssueWithoutReporterTest(JiraHttpClient jiraHttpClient) throws IntegrationException {
57+
void createIssueWithoutReporterTest(JiraHttpClient jiraHttpClient) throws IntegrationException {
5858
JiraServerServiceTestUtility.validateConfiguration();
5959

6060
JiraServerServiceFactory serviceFactory = JiraServerServiceTestUtility.createServiceFactory(jiraHttpClient);
@@ -71,7 +71,7 @@ public void createIssueWithoutReporterTest(JiraHttpClient jiraHttpClient) throws
7171

7272
@ParameterizedTest
7373
@MethodSource("getParameters")
74-
public void createIssueWithCustomFieldTest(JiraHttpClient jiraHttpClient) throws IntegrationException {
74+
void createIssueWithCustomFieldTest(JiraHttpClient jiraHttpClient) throws IntegrationException {
7575
JiraServerServiceTestUtility.validateConfiguration();
7676
JiraServerServiceFactory serviceFactory = JiraServerServiceTestUtility.createServiceFactory(jiraHttpClient);
7777
IssueService issueService = serviceFactory.createIssueService();

0 commit comments

Comments
 (0)