diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java index 39f521050..4644b0f08 100755 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java @@ -78,7 +78,7 @@ public class JiraOrderElementSynchronizer implements IJiraOrderElementSynchroniz String username = jiraConfiguration.getJiraUserId(); String password = jiraConfiguration.getJiraPassword(); - String path = "rest/api/latest/search"; + String path = JiraRESTClient.PATH_SEARCH; String query = "labels=" + label; List issues = JiraRESTClient.getIssues(url, username, password, diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraRESTClient.java b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraRESTClient.java index 384bc20fb..c2e7d5a04 100755 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraRESTClient.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraRESTClient.java @@ -42,6 +42,11 @@ import org.libreplan.ws.common.impl.Util; */ public class JiraRESTClient { + /** + * Path for search operation in JIRA REST API + */ + public static final String PATH_SEARCH = "rest/api/latest/search"; + private static final MediaType[] mediaTypes = new MediaType[] { MediaType.valueOf(MediaType.APPLICATION_JSON), MediaType.valueOf(MediaType.APPLICATION_XML) }; diff --git a/libreplan-webapp/src/test/java/org/libreplan/importers/JiraOrderElementSynchronizerTest.java b/libreplan-webapp/src/test/java/org/libreplan/importers/JiraOrderElementSynchronizerTest.java index 9ff3182c3..fa2503105 100644 --- a/libreplan-webapp/src/test/java/org/libreplan/importers/JiraOrderElementSynchronizerTest.java +++ b/libreplan-webapp/src/test/java/org/libreplan/importers/JiraOrderElementSynchronizerTest.java @@ -103,7 +103,6 @@ public class JiraOrderElementSynchronizerTest { @Autowired private IScenarioManager scenarioManager; - private static final String PATH = "rest/api/latest/search"; private static final String LABEL = "labels=epd_12a_ZorgActiviteiten"; private List issues; @@ -136,7 +135,8 @@ public class JiraOrderElementSynchronizerTest { Properties properties = loadProperties(); issues = JiraRESTClient.getIssues(properties.getProperty("url"), properties.getProperty("username"), - properties.getProperty("password"), PATH, LABEL); + properties.getProperty("password"), + JiraRESTClient.PATH_SEARCH, LABEL); } catch (FileNotFoundException e) { e.printStackTrace(); } catch (IOException e) { diff --git a/libreplan-webapp/src/test/java/org/libreplan/importers/JiraRESTClientTest.java b/libreplan-webapp/src/test/java/org/libreplan/importers/JiraRESTClientTest.java index d629e1e0a..aa1db6f4f 100644 --- a/libreplan-webapp/src/test/java/org/libreplan/importers/JiraRESTClientTest.java +++ b/libreplan-webapp/src/test/java/org/libreplan/importers/JiraRESTClientTest.java @@ -70,7 +70,7 @@ public class JiraRESTClientTest { List issues = JiraRESTClient.getIssues( properties.getProperty("url"), properties.getProperty("username"), - properties.getProperty("password"), "rest/api/latest/search", + properties.getProperty("password"), JiraRESTClient.PATH_SEARCH, "labels=Intrasprint"); assertTrue(issues.size() > 0); } @@ -78,7 +78,7 @@ public class JiraRESTClientTest { @Test(expected = RuntimeException.class) public void testGetIssuesForValidLabelButUnAuthorizedUser() { JiraRESTClient.getIssues(properties.getProperty("url"), "", "", - "rest/api/latest/search", "labels=Intrasprint"); + JiraRESTClient.PATH_SEARCH, "labels=Intrasprint"); } @Test @@ -86,7 +86,7 @@ public class JiraRESTClientTest { List issues = JiraRESTClient.getIssues( properties.getProperty("url"), properties.getProperty("username"), - properties.getProperty("password"), "rest/api/latest/search", + properties.getProperty("password"), JiraRESTClient.PATH_SEARCH, ""); assertTrue(issues.size() > 0); } diff --git a/libreplan-webapp/src/test/java/org/libreplan/importers/JiraTimesheetSynchronizerTest.java b/libreplan-webapp/src/test/java/org/libreplan/importers/JiraTimesheetSynchronizerTest.java index 6729aa673..75745b609 100644 --- a/libreplan-webapp/src/test/java/org/libreplan/importers/JiraTimesheetSynchronizerTest.java +++ b/libreplan-webapp/src/test/java/org/libreplan/importers/JiraTimesheetSynchronizerTest.java @@ -103,7 +103,6 @@ public class JiraTimesheetSynchronizerTest { @Autowired private IScenarioManager scenarioManager; - private static final String PATH = "rest/api/latest/search"; private static final String LABEL = "labels=epd_12a_ZorgActiviteiten"; private List issues; @@ -143,7 +142,8 @@ public class JiraTimesheetSynchronizerTest { Properties properties = loadProperties(); issues = JiraRESTClient.getIssues(properties.getProperty("url"), properties.getProperty("username"), - properties.getProperty("password"), PATH, LABEL); + properties.getProperty("password"), + JiraRESTClient.PATH_SEARCH, LABEL); } catch (FileNotFoundException e) { e.printStackTrace(); } catch (IOException e) {