You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2024/12/29 20:37:24 UTC

(maven-changes-plugin) 01/01: [MCHANGES-460] JIRA - Add Dependency upgrade to default type mapping

This is an automated email from the ASF dual-hosted git repository.

sjaranowski pushed a commit to branch MCHANGES-460
in repository https://gitbox.apache.org/repos/asf/maven-changes-plugin.git

commit 4d45ac5987176b40bd11af2e88ce190b14a97631
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sun Dec 29 21:37:08 2024 +0100

    [MCHANGES-460] JIRA - Add Dependency upgrade to default type mapping
---
 .../plugins/changes/announcement/AnnouncementMojo.java  |  4 ++--
 ...agmentSystem.java => JIRAIssueManagementSystem.java} | 17 +++++++----------
 .../apache/maven/plugins/changes/IssueAdapterTest.java  | 14 +++++++++-----
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/changes/announcement/AnnouncementMojo.java b/src/main/java/org/apache/maven/plugins/changes/announcement/AnnouncementMojo.java
index cb35490..41d48b5 100644
--- a/src/main/java/org/apache/maven/plugins/changes/announcement/AnnouncementMojo.java
+++ b/src/main/java/org/apache/maven/plugins/changes/announcement/AnnouncementMojo.java
@@ -43,7 +43,7 @@ import org.apache.maven.plugins.changes.github.GitHubIssueManagementSystem;
 import org.apache.maven.plugins.changes.issues.Issue;
 import org.apache.maven.plugins.changes.issues.IssueManagementSystem;
 import org.apache.maven.plugins.changes.issues.IssueUtils;
-import org.apache.maven.plugins.changes.jira.JIRAIssueManagmentSystem;
+import org.apache.maven.plugins.changes.jira.JIRAIssueManagementSystem;
 import org.apache.maven.plugins.changes.jira.RestJiraDownloader;
 import org.apache.maven.plugins.changes.model.Release;
 import org.apache.maven.plugins.changes.trac.TracDownloader;
@@ -684,7 +684,7 @@ public class AnnouncementMojo extends AbstractAnnouncementMojo {
                 getLog().debug("The JIRA Report will contain issues only for the current version.");
             }
 
-            return getReleases(issueList, new JIRAIssueManagmentSystem());
+            return getReleases(issueList, new JIRAIssueManagementSystem());
         } catch (Exception e) {
             throw new MojoExecutionException("Failed to extract issues from JIRA.", e);
         }
diff --git a/src/main/java/org/apache/maven/plugins/changes/jira/JIRAIssueManagmentSystem.java b/src/main/java/org/apache/maven/plugins/changes/jira/JIRAIssueManagementSystem.java
similarity index 70%
rename from src/main/java/org/apache/maven/plugins/changes/jira/JIRAIssueManagmentSystem.java
rename to src/main/java/org/apache/maven/plugins/changes/jira/JIRAIssueManagementSystem.java
index 18467a2..d49bc8e 100644
--- a/src/main/java/org/apache/maven/plugins/changes/jira/JIRAIssueManagmentSystem.java
+++ b/src/main/java/org/apache/maven/plugins/changes/jira/JIRAIssueManagementSystem.java
@@ -26,19 +26,16 @@ import org.apache.maven.plugins.changes.issues.AbstractIssueManagementSystem;
  *
  * @version $Id$
  */
-public class JIRAIssueManagmentSystem extends AbstractIssueManagementSystem {
-    private static final String DEFAULT_ADD_TYPE = "New Feature";
+public class JIRAIssueManagementSystem extends AbstractIssueManagementSystem {
 
-    private static final String DEFAULT_FIX_TYPE = "Bug";
-
-    private static final String DEFAULT_UPDATE_TYPE = "Improvement";
-
-    public JIRAIssueManagmentSystem() {
+    public JIRAIssueManagementSystem() {
         super();
         // Add the standard issue types for JIRA
-        issueTypeMap.put(DEFAULT_ADD_TYPE, IssueType.ADD);
-        issueTypeMap.put(DEFAULT_FIX_TYPE, IssueType.FIX);
-        issueTypeMap.put(DEFAULT_UPDATE_TYPE, IssueType.UPDATE);
+        issueTypeMap.put("Bug", IssueType.FIX);
+        issueTypeMap.put("Dependency upgrade", IssueType.UPDATE);
+        issueTypeMap.put("Improvement", IssueType.UPDATE);
+        issueTypeMap.put("New Feature", IssueType.ADD);
+        issueTypeMap.put("Task", IssueType.UPDATE);
     }
 
     @Override
diff --git a/src/test/java/org/apache/maven/plugins/changes/IssueAdapterTest.java b/src/test/java/org/apache/maven/plugins/changes/IssueAdapterTest.java
index 6d4dba3..4f3f024 100644
--- a/src/test/java/org/apache/maven/plugins/changes/IssueAdapterTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/IssueAdapterTest.java
@@ -24,7 +24,7 @@ import java.util.List;
 import junit.framework.TestCase;
 import org.apache.maven.plugins.changes.issues.Issue;
 import org.apache.maven.plugins.changes.issues.IssueManagementSystem;
-import org.apache.maven.plugins.changes.jira.JIRAIssueManagmentSystem;
+import org.apache.maven.plugins.changes.jira.JIRAIssueManagementSystem;
 import org.apache.maven.plugins.changes.model.Action;
 import org.apache.maven.plugins.changes.model.Release;
 
@@ -36,7 +36,7 @@ import org.apache.maven.plugins.changes.model.Release;
 public class IssueAdapterTest extends TestCase {
 
     public void testDefaultIssueTypeMapping() {
-        IssueAdapter adapter = new IssueAdapter(new JIRAIssueManagmentSystem());
+        IssueAdapter adapter = new IssueAdapter(new JIRAIssueManagementSystem());
 
         Issue issue = createIssue("TST-1", "New Feature");
         Action action = adapter.createAction(issue);
@@ -50,13 +50,17 @@ public class IssueAdapterTest extends TestCase {
         action = adapter.createAction(issue);
         assertEquals("update", action.getType());
 
+        issue = createIssue("TST-3", "Dependency upgrade");
+        action = adapter.createAction(issue);
+        assertEquals("update", action.getType());
+
         issue = createIssue("TST-4", "Unknown Type");
         action = adapter.createAction(issue);
         assertEquals("", action.getType());
     }
 
     public void testCustomIssueTypeMappingOveridesDefaultMapping() {
-        IssueManagementSystem ims = new JIRAIssueManagmentSystem();
+        IssueManagementSystem ims = new JIRAIssueManagementSystem();
 
         ims.getIssueTypeMap().clear();
         IssueAdapter adapter = new IssueAdapter(ims);
@@ -79,7 +83,7 @@ public class IssueAdapterTest extends TestCase {
     }
 
     public void testCustomIssueTypeMapping() {
-        IssueManagementSystem ims = new JIRAIssueManagmentSystem();
+        IssueManagementSystem ims = new JIRAIssueManagementSystem();
         ims.getIssueTypeMap().put("Story", IssueType.ADD);
         ims.getIssueTypeMap().put("Epic", IssueType.ADD);
         ims.getIssueTypeMap().put("Defect", IssueType.FIX);
@@ -126,7 +130,7 @@ public class IssueAdapterTest extends TestCase {
     }
 
     public void testReleaseOrder() {
-        IssueManagementSystem ims = new JIRAIssueManagmentSystem();
+        IssueManagementSystem ims = new JIRAIssueManagementSystem();
         ims.getIssueTypeMap().put("Story", IssueType.ADD);
         ims.getIssueTypeMap().put("Epic", IssueType.ADD);
         ims.getIssueTypeMap().put("Defect", IssueType.FIX);