Skip to content

replace javax usage with jakarta #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vladinu wants to merge 1 commit into from
Closed

replace javax usage with jakarta #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions jira-xray-zephyr-squad/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...dashboard/jiratest/adapter/atlassianbespoke/client/CustomAsynchronousIssueRestClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import java.net.URI;
import java.util.EnumSet;
import javax.ws.rs.core.UriBuilder;

import com.atlassian.httpclient.api.HttpClient;
import com.atlassian.jira.rest.client.api.MetadataRestClient;
Expand All @@ -32,6 +31,7 @@
import com.publicissapient.kpidashboard.jiratest.adapter.atlassianbespoke.parser.CustomIssueJsonParser;

import io.atlassian.util.concurrent.Promise;
import jakarta.ws.rs.core.UriBuilder;

public class CustomAsynchronousIssueRestClient extends AsynchronousIssueRestClient {

Expand Down
25 changes: 13 additions & 12 deletions ...ssapient/kpidashboard/jiratest/adapter/atlassianbespoke/parser/CustomIssueJsonParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Set;

import javax.annotation.Nullable;
import javax.ws.rs.core.UriBuilder;

import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONException;
Expand Down Expand Up @@ -107,6 +107,8 @@
import com.google.common.collect.Sets;
import com.publicissapient.kpidashboard.jiratest.adapter.atlassianbespoke.util.JsonParseUtil;

import jakarta.ws.rs.core.UriBuilder;

public class CustomIssueJsonParser implements JsonObjectParser<Issue> {

public static final String SCHEMA_SECTION = "schema";
Expand Down Expand Up @@ -209,7 +211,8 @@ private JSONObject getFieldUnisex(final JSONObject json, final String attributeN
}

@Nullable
private String getOptionalFieldStringUnisex(final JSONObject json, final String attributeName) throws JSONException {
private String getOptionalFieldStringUnisex(final JSONObject json, final String attributeName)
throws JSONException {
final JSONObject fieldsJson = json.getJSONObject(FIELDS);
return JsonParseUtil.getOptionalString(fieldsJson, attributeName);
}
Expand All @@ -229,8 +232,7 @@ public Issue parse(final JSONObject issueJson) throws JSONException {
final Iterable<String> expandos = parseExpandos(issueJson);
final JSONObject jsonFields = issueJson.getJSONObject(FIELDS);
final JSONObject commentsJson = jsonFields.optJSONObject(COMMENT_FIELD.id);
final Collection<Comment> comments = (commentsJson == null)
? Collections.<Comment>emptyList()
final Collection<Comment> comments = (commentsJson == null) ? Collections.<Comment>emptyList()
: parseArray(commentsJson, new JsonWeakParserForJsonObject<Comment>(commentJsonParser), "comments");

final String summary = getFieldStringValue(issueJson, SUMMARY_FIELD.id);
Expand Down Expand Up @@ -284,8 +286,8 @@ public Issue parse(final JSONObject issueJson) throws JSONException {

if (JsonParseUtil.getNestedOptionalObject(issueJson, FIELDS, WORKLOG_FIELD.id) != null) {
worklogs = parseOptionalArray(issueJson,
new JsonWeakParserForJsonObject<Worklog>(new WorklogJsonParserV5(selfUri)), FIELDS, WORKLOG_FIELD.id,
WORKLOGS_FIELD.id);
new JsonWeakParserForJsonObject<Worklog>(new WorklogJsonParserV5(selfUri)), FIELDS,
WORKLOG_FIELD.id, WORKLOGS_FIELD.id);
} else {
worklogs = Collections.emptyList();
}
Expand All @@ -301,15 +303,14 @@ public Issue parse(final JSONObject issueJson) throws JSONException {
new JsonWeakParserForJsonObject<ChangelogGroup>(changelogJsonParser), "changelog", "histories");
final Operations operations = parseOptionalJsonObject(issueJson, "operations", operationsJsonParser);

return new Issue(summary, selfUri, basicIssue.getKey(), basicIssue.getId(), project, issueType, status, description,
priority, resolution, attachments, reporter, assignee, creationDate, updateDate, dueDate, affectedVersions,
fixVersions, components, timeTracking, fields, comments, transitionsUri, issueLinks, votes, worklogs, watchers,
expandos, subtasks, changelog, operations, labels);
return new Issue(summary, selfUri, basicIssue.getKey(), basicIssue.getId(), project, issueType, status,
description, priority, resolution, attachments, reporter, assignee, creationDate, updateDate, dueDate,
affectedVersions, fixVersions, components, timeTracking, fields, comments, transitionsUri, issueLinks,
votes, worklogs, watchers, expandos, subtasks, changelog, operations, labels);
}

private URI parseTransisionsUri(final String transitionsUriString, final URI selfUri) {
return transitionsUriString != null
? JsonParseUtil.parseURI(transitionsUriString)
return transitionsUriString != null ? JsonParseUtil.parseURI(transitionsUriString)
: UriBuilder.fromUri(selfUri).path("transitions").queryParam("expand", "transitions.fields").build();
}

Expand Down
3 changes: 2 additions & 1 deletion ...ssapient/kpidashboard/jiratest/adapter/impl/async/impl/ProcessorAsynchJiraRestClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package com.publicissapient.kpidashboard.jiratest.adapter.impl.async.impl;

import java.net.URI;
import javax.ws.rs.core.UriBuilder;

import com.atlassian.jira.rest.client.api.IssueRestClient;
import com.atlassian.jira.rest.client.api.SearchRestClient;
Expand All @@ -28,6 +27,8 @@
import com.publicissapient.kpidashboard.jiratest.adapter.atlassianbespoke.client.CustomAsynchronousIssueRestClient;
import com.publicissapient.kpidashboard.jiratest.adapter.impl.async.ProcessorJiraRestClient;

import jakarta.ws.rs.core.UriBuilder;

public class ProcessorAsynchJiraRestClient extends AsynchronousJiraRestClient implements ProcessorJiraRestClient {

private final SearchRestClient searchRestClient;
Expand Down
2 changes: 1 addition & 1 deletion ...apient/kpidashboard/jiratest/adapter/impl/async/impl/ProcessorAsynchSearchRestClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import java.util.Set;

import javax.annotation.Nullable;
import javax.ws.rs.core.UriBuilder;

import org.apache.commons.lang3.StringUtils;
import org.codehaus.jettison.json.JSONException;
Expand All @@ -49,6 +48,7 @@
import com.publicissapient.kpidashboard.jiratest.util.JiraConstants;

import io.atlassian.util.concurrent.Promise;
import jakarta.ws.rs.core.UriBuilder;

public class ProcessorAsynchSearchRestClient extends AbstractAsynchronousRestClient implements SearchRestClient {

Expand Down
5 changes: 5 additions & 0 deletions jira/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.1.0</version>
</dependency>
<!-- Logging dependencies> -->
<dependency>
<groupId>ch.qos.logback</groupId>
Expand Down
3 changes: 2 additions & 1 deletion .../java/com/publicissapient/kpidashboard/jira/client/CustomAsynchronousIssueRestClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import java.net.URI;
import java.util.EnumSet;
import java.util.Set;

import javax.annotation.Nullable;
import javax.ws.rs.core.UriBuilder;

import org.apache.commons.lang3.StringUtils;
import org.codehaus.jettison.json.JSONException;
Expand All @@ -47,6 +47,7 @@
import com.publicissapient.kpidashboard.jira.parser.CustomSearchResultJsonParser;

import io.atlassian.util.concurrent.Promise;
import jakarta.ws.rs.core.UriBuilder;
import lombok.extern.slf4j.Slf4j;

@Slf4j
Expand Down
3 changes: 2 additions & 1 deletion ...main/java/com/publicissapient/kpidashboard/jira/client/ProcessorAsynchJiraRestClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@
package com.publicissapient.kpidashboard.jira.client;

import java.net.URI;
import javax.ws.rs.core.UriBuilder;

import com.atlassian.jira.rest.client.api.IssueRestClient;
import com.atlassian.jira.rest.client.api.SearchRestClient;
import com.atlassian.jira.rest.client.internal.async.AsynchronousJiraRestClient;
import com.atlassian.jira.rest.client.internal.async.DisposableHttpClient;

import jakarta.ws.rs.core.UriBuilder;

public class ProcessorAsynchJiraRestClient extends AsynchronousJiraRestClient implements ProcessorJiraRestClient {

private final SearchRestClient searchRestClient;
Expand Down
3 changes: 2 additions & 1 deletion ...in/java/com/publicissapient/kpidashboard/jira/client/ProcessorAsynchSearchRestClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import java.net.URI;
import java.util.List;
import java.util.Set;

import javax.annotation.Nullable;
import javax.ws.rs.core.UriBuilder;

import org.apache.commons.lang3.StringUtils;
import org.codehaus.jettison.json.JSONException;
Expand All @@ -48,6 +48,7 @@
import com.publicissapient.kpidashboard.jira.parser.CustomSearchResultJsonParser;

import io.atlassian.util.concurrent.Promise;
import jakarta.ws.rs.core.UriBuilder;

public class ProcessorAsynchSearchRestClient extends AbstractAsynchronousRestClient implements SearchRestClient {

Expand Down
4 changes: 3 additions & 1 deletion jira/src/main/java/com/publicissapient/kpidashboard/jira/parser/CustomIssueJsonParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Set;

import javax.annotation.Nullable;
import javax.ws.rs.core.UriBuilder;

import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONException;
Expand Down Expand Up @@ -107,6 +107,8 @@
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;

import jakarta.ws.rs.core.UriBuilder;

public class CustomIssueJsonParser implements JsonObjectParser<Issue> {

public static final String SCHEMA_SECTION = "schema";
Expand Down
42 changes: 20 additions & 22 deletions jira/src/main/java/com/publicissapient/kpidashboard/jira/service/FetchEpicDataImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
******************************************************************************/
package com.publicissapient.kpidashboard.jira.service;

import static com.atlassian.jira.rest.client.api.IssueRestClient.Expandos.CHANGELOG;
import static com.atlassian.jira.rest.client.api.IssueRestClient.Expandos.NAMES;
import static com.atlassian.jira.rest.client.api.IssueRestClient.Expandos.SCHEMA;

import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URI;
Expand All @@ -31,50 +35,44 @@
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;

import com.atlassian.jira.rest.client.api.IssueRestClient;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.publicissapient.kpidashboard.jira.constant.JiraConstants;
import com.publicissapient.kpidashboard.jira.exception.JiraApiException;
import com.publicissapient.kpidashboard.jira.model.JiraSearchResponse;
import com.publicissapient.kpidashboard.jira.parser.JiraSearchResponseParser;
import kong.unirest.HttpResponse;
import kong.unirest.JsonNode;
import kong.unirest.Unirest;
import javax.annotation.Nullable;

import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.codehaus.jettison.json.JSONException;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import com.atlassian.jira.rest.client.api.IssueRestClient;
import com.atlassian.jira.rest.client.api.RestClientException;
import com.atlassian.jira.rest.client.api.domain.Issue;
import com.atlassian.jira.rest.client.api.domain.SearchResult;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import com.publicissapient.kpidashboard.common.client.KerberosClient;
import com.publicissapient.kpidashboard.common.model.connection.Connection;
import com.publicissapient.kpidashboard.jira.client.ProcessorJiraRestClient;
import com.publicissapient.kpidashboard.jira.config.JiraProcessorConfig;
import com.publicissapient.kpidashboard.jira.constant.JiraConstants;
import com.publicissapient.kpidashboard.jira.exception.JiraApiException;
import com.publicissapient.kpidashboard.jira.model.JiraSearchResponse;
import com.publicissapient.kpidashboard.jira.model.JiraToolConfig;
import com.publicissapient.kpidashboard.jira.model.ProjectConfFieldMapping;
import com.publicissapient.kpidashboard.jira.parser.JiraSearchResponseParser;

import io.atlassian.util.concurrent.Promise;
import jakarta.ws.rs.core.UriBuilder;
import kong.unirest.HttpResponse;
import kong.unirest.JsonNode;
import kong.unirest.Unirest;
import lombok.extern.slf4j.Slf4j;

import javax.annotation.Nullable;
import javax.ws.rs.core.UriBuilder;

import static com.atlassian.jira.rest.client.api.IssueRestClient.Expandos.CHANGELOG;
import static com.atlassian.jira.rest.client.api.IssueRestClient.Expandos.NAMES;
import static com.atlassian.jira.rest.client.api.IssueRestClient.Expandos.SCHEMA;

@Slf4j
@Service
public class FetchEpicDataImpl implements FetchEpicData {
Expand Down
6 changes: 0 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,6 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.1.1</version>
<scope>compile</scope>
</dependency>
<!--- adding new dependencies-->
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
Loading