Issue #46 : Migrated to version 5.0.4 of jira-rest-java-client-core.

schrepfler · Aug 30, 2018 · 984302e · 984302e
1 parent f0f8972
commit 984302e
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 50 deletions.
diff --git a/pom.xml b/pom.xml
@@ -29,8 +29,7 @@
         <maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
         <license.maven.plugin.version>1.16</license.maven.plugin.version>
         <versions.maven.plugin.version>2.5</versions.maven.plugin.version>
-        <jira.rest.java.client.version>2.0.0-m2</jira.rest.java.client.version>
-        <jira.server.version>7.4.3</jira.server.version>
+        <jira.rest.java.client.version>5.0.4</jira.rest.java.client.version>
         <maven.version>3.5.4</maven.version>
         <jgitflow.maven.plugin.version>1.0-m5.1</jgitflow.maven.plugin.version>
         <nexus.staging.maven.plugin.version>1.6.8</nexus.staging.maven.plugin.version>
@@ -134,12 +133,12 @@
     <dependencies>
         <dependency>
             <groupId>com.atlassian.jira</groupId>
-            <artifactId>jira-rest-java-client</artifactId>
+            <artifactId>jira-rest-java-client-core</artifactId>
             <version>${jira.rest.java.client.version}</version>
             <exclusions>
                 <exclusion>
-                        <groupId>com.google.guava</groupId>
-                        <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -210,6 +209,14 @@
             <version>${maven.version}</version>
             <scope>compile</scope>
         </dependency>
+
+        <!-- test -->
+        <dependency>
+            <groupId>org.apache.maven.plugin-testing</groupId>
+            <artifactId>maven-plugin-testing-harness</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <scm>

diff --git a/src/main/java/net/sigmalab/maven/plugin/jira/AbstractJiraMojo.java b/src/main/java/net/sigmalab/maven/plugin/jira/AbstractJiraMojo.java
@@ -15,8 +15,8 @@
 import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
 import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException;
 
-import com.atlassian.jira.rest.client.JiraRestClient;
-import com.atlassian.jira.rest.client.JiraRestClientFactory;
+import com.atlassian.jira.rest.client.api.JiraRestClient;
+import com.atlassian.jira.rest.client.api.JiraRestClientFactory;
 import com.atlassian.jira.rest.client.internal.async.AsynchronousJiraRestClientFactory;
 
 /**

diff --git a/src/main/java/net/sigmalab/maven/plugin/jira/CreateNewVersionMojo.java b/src/main/java/net/sigmalab/maven/plugin/jira/CreateNewVersionMojo.java
@@ -3,12 +3,12 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
 
-import com.atlassian.jira.rest.client.JiraRestClient;
-import com.atlassian.jira.rest.client.ProjectRestClient;
-import com.atlassian.jira.rest.client.VersionRestClient;
-import com.atlassian.jira.rest.client.domain.Project;
-import com.atlassian.jira.rest.client.domain.Version;
-import com.atlassian.jira.rest.client.domain.input.VersionInput;
+import com.atlassian.jira.rest.client.api.JiraRestClient;
+import com.atlassian.jira.rest.client.api.ProjectRestClient;
+import com.atlassian.jira.rest.client.api.VersionRestClient;
+import com.atlassian.jira.rest.client.api.domain.Project;
+import com.atlassian.jira.rest.client.api.domain.Version;
+import com.atlassian.jira.rest.client.api.domain.input.VersionInput;
 
 /**
  * Goal that creates a version in a JIRA project . NOTE: REST API access must be

diff --git a/src/main/java/net/sigmalab/maven/plugin/jira/GenerateReleaseNotesMojo.java b/src/main/java/net/sigmalab/maven/plugin/jira/GenerateReleaseNotesMojo.java
@@ -11,10 +11,10 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
 
-import com.atlassian.jira.rest.client.IssueRestClient;
-import com.atlassian.jira.rest.client.JiraRestClient;
-import com.atlassian.jira.rest.client.domain.BasicIssue;
-import com.atlassian.jira.rest.client.domain.Issue;
+import com.atlassian.jira.rest.client.api.IssueRestClient;
+import com.atlassian.jira.rest.client.api.JiraRestClient;
+import com.atlassian.jira.rest.client.api.domain.BasicIssue;
+import com.atlassian.jira.rest.client.api.domain.Issue;
 import com.google.common.collect.Iterables;
 
 /**
@@ -93,7 +93,7 @@ public class GenerateReleaseNotesMojo extends AbstractJiraMojo {
     public void doExecute(JiraRestClient jiraRestClient) throws MojoFailureException {
         log.info("Generating release note");
 
-        Iterable<BasicIssue> issues = getIssues(jiraRestClient);
+        Iterable<Issue> issues = getIssues(jiraRestClient);
         log.debug("Found " + Iterables.size(issues) + " issues.");
 
         try {
@@ -107,20 +107,20 @@ public void doExecute(JiraRestClient jiraRestClient) throws MojoFailureException
     /**
      * Recover issues from JIRA based on JQL Filter
      */
-    private Iterable<BasicIssue> getIssues(JiraRestClient restClient) {
+    private Iterable<Issue> getIssues(JiraRestClient restClient) {
         String jql = format(jqlTemplate, getJiraProjectKey(), releaseVersion);
         log.info("Searching for ");
         log.debug("JQL Query: " + jql);
 
-        return restClient.getSearchClient().searchJql(jql, maxIssues, 0).claim().getIssues();
+        return restClient.getSearchClient().searchJql(jql, maxIssues, 0, null).claim().getIssues();
     }
 
     /**
      * Writes issues to output
      * 
      * @param issues
      */
-    private void output(JiraRestClient restClient, Iterable<BasicIssue> issues) throws IOException {
+    private void output(JiraRestClient restClient, Iterable<Issue> issues) throws IOException {
         IssueRestClient issueClient = restClient.getIssueClient();
 
         if ( targetFile == null ) {

diff --git a/src/main/java/net/sigmalab/maven/plugin/jira/ReleaseVersionMojo.java b/src/main/java/net/sigmalab/maven/plugin/jira/ReleaseVersionMojo.java
@@ -4,9 +4,9 @@
 import org.apache.maven.plugin.logging.Log;
 import org.joda.time.DateTime;
 
-import com.atlassian.jira.rest.client.JiraRestClient;
-import com.atlassian.jira.rest.client.domain.Version;
-import com.atlassian.jira.rest.client.domain.input.VersionInputBuilder;
+import com.atlassian.jira.rest.client.api.JiraRestClient;
+import com.atlassian.jira.rest.client.api.domain.Version;
+import com.atlassian.jira.rest.client.api.domain.input.VersionInputBuilder;
 
 /**
  * Goal that creates a version in a JIRA project . NOTE: API access must be

diff --git a/src/test/java/net/sigmalab/maven/plugin/jira/testClasses/CreateNewVersionMojoTest.java b/src/test/java/net/sigmalab/maven/plugin/jira/testClasses/CreateNewVersionMojoTest.java
@@ -15,12 +15,12 @@
 import org.junit.runners.JUnit4;
 import org.mockito.Mockito;
 
-import com.atlassian.jira.rest.client.JiraRestClient;
-import com.atlassian.jira.rest.client.ProjectRestClient;
-import com.atlassian.jira.rest.client.VersionRestClient;
-import com.atlassian.jira.rest.client.domain.Project;
-import com.atlassian.jira.rest.client.domain.Version;
-import com.atlassian.jira.rest.client.domain.input.VersionInput;
+import com.atlassian.jira.rest.client.api.JiraRestClient;
+import com.atlassian.jira.rest.client.api.ProjectRestClient;
+import com.atlassian.jira.rest.client.api.VersionRestClient;
+import com.atlassian.jira.rest.client.api.domain.Project;
+import com.atlassian.jira.rest.client.api.domain.Version;
+import com.atlassian.jira.rest.client.api.domain.input.VersionInput;
 import com.atlassian.util.concurrent.Promise;
 
 import net.sigmalab.maven.plugin.jira.CreateNewVersionMojo;

diff --git a/src/test/java/net/sigmalab/maven/plugin/jira/testClasses/GenerateReleaseNotesMojoTest.java b/src/test/java/net/sigmalab/maven/plugin/jira/testClasses/GenerateReleaseNotesMojoTest.java
@@ -4,9 +4,11 @@
 import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.isNull;
 
 import java.io.File;
 import java.util.Arrays;
+import java.util.Set;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
@@ -16,12 +18,11 @@
 import org.junit.runners.JUnit4;
 import org.mockito.Mockito;
 
-import com.atlassian.jira.rest.client.IssueRestClient;
-import com.atlassian.jira.rest.client.JiraRestClient;
-import com.atlassian.jira.rest.client.SearchRestClient;
-import com.atlassian.jira.rest.client.domain.BasicIssue;
-import com.atlassian.jira.rest.client.domain.Issue;
-import com.atlassian.jira.rest.client.domain.SearchResult;
+import com.atlassian.jira.rest.client.api.IssueRestClient;
+import com.atlassian.jira.rest.client.api.JiraRestClient;
+import com.atlassian.jira.rest.client.api.SearchRestClient;
+import com.atlassian.jira.rest.client.api.domain.Issue;
+import com.atlassian.jira.rest.client.api.domain.SearchResult;
 import com.atlassian.util.concurrent.Promise;
 
 import net.sigmalab.maven.plugin.jira.GenerateReleaseNotesMojo;
@@ -30,18 +31,18 @@
 public class GenerateReleaseNotesMojoTest extends AbstractMojoTestCase {
     private static final String NEWLINE = System.getProperty("line.separator");
 
-    private static final BasicIssue[] ISSUE_ARRAY = new BasicIssue[] { new BasicIssue(null, "DUMMY-1"),
-                                                                       new BasicIssue(null, "DUMMY-4"),
-                                                                       new BasicIssue(null, "DUMMY-3"),
-                                                                       new BasicIssue(null, "DUMMY-2") };
+    private static final Issue[] ISSUE_ARRAY = new Issue[] { new Issue("Dummy Issue", null, "DUMMY-1", null, null, null, null, "Dummy Issue Description", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null),
+                                                             new Issue("Dummy Issue", null, "DUMMY-4", null, null, null, null, "Dummy Issue Description", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null),
+                                                             new Issue("Dummy Issue", null, "DUMMY-3", null, null, null, null, "Dummy Issue Description", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null),
+                                                             new Issue("Dummy Issue", null, "DUMMY-2", null, null, null, null, "Dummy Issue Description", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null) };
 
-    private static final Iterable<BasicIssue> ISSUES = Arrays.asList(ISSUE_ARRAY);
+    private static final Iterable<Issue> ISSUES = Arrays.asList(ISSUE_ARRAY);
 
     private static final Issue DUMMY_ISSUE = new Issue("Dummy Issue", null, "ISSUE-1", null, null, null,
-                                                       "Dummy Issue Description", null, null, null, null,
+                                                       null, "Dummy Issue Description", null, null, null, null,
                                                        null, null, null, null, null, null, null, null,
                                                        null, null, null, null, null, null, null, null,
-                                                       null, null, null);
+                                                       null, null, null, null);
 
     private GenerateReleaseNotesMojo releaseNoteMojo;
 
@@ -74,7 +75,7 @@ public void setUp() throws Exception {
 
         @SuppressWarnings("unchecked")
         Promise<SearchResult> mockSearchPromise = (Promise<SearchResult>) Mockito.mock(Promise.class);
-        Mockito.when(mockSearchClient.searchJql(anyString(), anyInt(), anyInt())).thenReturn(mockSearchPromise);
+        Mockito.when(mockSearchClient.searchJql(anyString(), anyInt(), anyInt(), (Set<String>) isNull())).thenReturn(mockSearchPromise);
 
         SearchResult mockSearchResult = Mockito.mock(SearchResult.class);
         Mockito.when(mockSearchPromise.claim()).thenReturn(mockSearchResult);

diff --git a/src/test/java/net/sigmalab/maven/plugin/jira/testClasses/ReleaseVersionMojoTest.java b/src/test/java/net/sigmalab/maven/plugin/jira/testClasses/ReleaseVersionMojoTest.java
@@ -17,12 +17,12 @@
 import org.junit.runners.JUnit4;
 import org.mockito.Mockito;
 
-import com.atlassian.jira.rest.client.JiraRestClient;
-import com.atlassian.jira.rest.client.ProjectRestClient;
-import com.atlassian.jira.rest.client.VersionRestClient;
-import com.atlassian.jira.rest.client.domain.Project;
-import com.atlassian.jira.rest.client.domain.Version;
-import com.atlassian.jira.rest.client.domain.input.VersionInput;
+import com.atlassian.jira.rest.client.api.JiraRestClient;
+import com.atlassian.jira.rest.client.api.ProjectRestClient;
+import com.atlassian.jira.rest.client.api.VersionRestClient;
+import com.atlassian.jira.rest.client.api.domain.Project;
+import com.atlassian.jira.rest.client.api.domain.Version;
+import com.atlassian.jira.rest.client.api.domain.input.VersionInput;
 import com.atlassian.util.concurrent.Promise;
 
 import net.sigmalab.maven.plugin.jira.ReleaseVersionMojo;