RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jira-integration: Several refactorizations in JiraRESTClient

Browse source 
* Extracted paths for JIRA REST API to constants.
* Code simplification:
  * Use StringUtils.split
  * Use Collections.singletonList

FEA: ItEr77S16JiraAndTimConnectorContributionIntegration
This commit is contained in:
Manuel Rego Casasnovas 2013-01-30 11:35:18 +01:00
parent 851357d760
commit f6ec4e5220
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libreplan-webapp/src/main/java/org/libreplan/importers/JiraRESTClient.java
View file

@ -21,12 +21,14 @@ package org.libreplan.importers;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import org.apache.commons.lang.StringUtils;
import org.apache.cxf.jaxrs.client.WebClient;
import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
import org.codehaus.jackson.map.DeserializationConfig.Feature;
@ -42,11 +44,22 @@ 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";
/**
* Path for authenticate session in JIRA REST API
*/
public static final String PATH_AUTH_SESSION = "rest/auth/latest/session";
/**
* Path for issue operations in JIRA REST API
*/
public static final String PATH_ISSUE = "/rest/api/latest/issue/";
private static final MediaType[] mediaTypes = new MediaType[] {
MediaType.valueOf(MediaType.APPLICATION_JSON),
MediaType.valueOf(MediaType.APPLICATION_XML) };
@ -62,7 +75,7 @@ public class JiraRESTClient {
public static List<String> getAllLables(String url) {
WebClient client = WebClient.create(url).accept(mediaTypes);
String labels = client.get(String.class);
return Arrays.asList(labels.split("\\s*,\\s*"));
return Arrays.asList(StringUtils.split(labels, ","));
}
/**
@ -104,11 +117,10 @@ public class JiraRESTClient {
JacksonJaxbJsonProvider jacksonJaxbJsonProvider = new JacksonJaxbJsonProvider();
jacksonJaxbJsonProvider.configure(Feature.FAIL_ON_UNKNOWN_PROPERTIES,
false);
List<Object> providers = new ArrayList<Object>();
providers.add(jacksonJaxbJsonProvider);
return WebClient.create(url, providers).accept(mediaTypes);
return WebClient.create(url,
Collections.singletonList(jacksonJaxbJsonProvider)).accept(
mediaTypes);
}
@ -126,7 +138,7 @@ public class JiraRESTClient {
String password) {
NaiveTrustProvider.setAlwaysTrust(true);
client.path("rest/auth/latest/session");
client.path(PATH_AUTH_SESSION);
Util.addAuthorizationHeader(client, login, password);
Response response = client.get();
@ -149,7 +161,7 @@ public class JiraRESTClient {
private static List<Issue> getIssuesDetails(WebClient client, List<Issue> issues) {
client.back(true);
client.path("/rest/api/latest/issue/");
client.path(PATH_ISSUE);
List<Issue> issueDetails = new ArrayList<Issue>();
for (Issue issue : issues) {

3
libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
View file

@ -50,6 +50,7 @@ import org.libreplan.business.common.entities.ProgressType;
import org.libreplan.business.common.exceptions.ValidationException;
import org.libreplan.business.costcategories.entities.TypeOfWorkHours;
import org.libreplan.business.users.entities.UserRole;
import org.libreplan.importers.JiraRESTClient;
import org.libreplan.web.common.components.bandboxsearch.BandboxSearch;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.core.LdapTemplate;
@ -273,7 +274,7 @@ public class ConfigurationController extends GenericForwardComposer {
.getJiraConfiguration();
WebClient client = WebClient.create(jiraConfiguration.getJiraUrl());
client.path("rest/auth/latest/session").accept(
client.path(JiraRESTClient.PATH_AUTH_SESSION).accept(
MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML);
org.libreplan.ws.common.impl.Util.addAuthorizationHeader(client,