Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1C83E10A22 for ; Sat, 15 Mar 2014 23:32:24 +0000 (UTC) Received: (qmail 56074 invoked by uid 500); 15 Mar 2014 23:32:23 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 55977 invoked by uid 500); 15 Mar 2014 23:32:22 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 55970 invoked by uid 99); 15 Mar 2014 23:32:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Mar 2014 23:32:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Mar 2014 23:32:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 675A123888E2; Sat, 15 Mar 2014 23:31:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1577954 - /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java Date: Sat, 15 Mar 2014 23:31:58 -0000 To: commits@maven.apache.org From: dennisl@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140315233158.675A123888E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dennisl Date: Sat Mar 15 23:31:58 2014 New Revision: 1577954 URL: http://svn.apache.org/r1577954 Log: [MCHANGES-329] RestJiraDownloader does not handle components, type, updated or version Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java?rev=1577954&r1=1577953&r2=1577954&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java Sat Mar 15 23:31:58 2014 @@ -300,9 +300,14 @@ public class RestJiraDownloader extends val = fieldsNode.get( "comment" ); processComments( issue, val ); + val = fieldsNode.get( "components" ); + processComponents( issue, val ); + val = fieldsNode.get( "fixVersions" ); processFixVersions( issue, val ); + val = fieldsNode.get( "issuetype" ); + processIssueType( issue, val ); val = fieldsNode.get( "priority" ); processPriority( issue, val ); @@ -322,19 +327,18 @@ public class RestJiraDownloader extends issue.setSummary( val.asText() ); } - val = issueNode.get( "title" ); + val = fieldsNode.get( "title" ); if ( val != null ) { issue.setTitle( val.asText() ); } - val = issueNode.get( "updated" ); + val = fieldsNode.get( "updated" ); processUpdated( issue, val ); - val = issueNode.get( "versions" ); + val = fieldsNode.get( "versions" ); processVersions( issue, val ); - issueList.add( issue ); } } @@ -359,7 +363,7 @@ public class RestJiraDownloader extends private void processStatus( Issue issue, JsonNode val ) { - if (val != null ) + if ( val != null ) { issue.setStatus( val.get( "name" ).asText() ); } @@ -367,7 +371,7 @@ public class RestJiraDownloader extends private void processPriority( Issue issue, JsonNode val ) { - if (val != null ) + if ( val != null ) { issue.setPriority( val.get( "name" ).asText() ); } @@ -375,7 +379,7 @@ public class RestJiraDownloader extends private void processResolution( Issue issue, JsonNode val ) { - if (val != null ) + if ( val != null ) { issue.setResolution( val.get( "name" ).asText() ); } @@ -447,7 +451,7 @@ public class RestJiraDownloader extends } catch ( ParseException e ) { - getLog().warn( "Invalid created date " + val.asText() ); + getLog().warn( "Invalid updated date " + val.asText() ); } } } @@ -460,7 +464,7 @@ public class RestJiraDownloader extends private void processFixVersions( Issue issue, JsonNode val ) { - if (val != null) + if ( val != null) { assert val.isArray(); for ( int vx = 0; vx < val.size(); vx++ ) @@ -484,6 +488,27 @@ public class RestJiraDownloader extends } } + private void processComponents( Issue issue, JsonNode val ) + { + if ( val != null ) + { + assert val.isArray(); + for ( int cx = 0; cx < val.size(); cx++ ) + { + JsonNode cnode = val.get( cx ); + issue.addComponent( cnode.get( "name" ).asText() ); + } + } + } + + private void processIssueType( Issue issue, JsonNode val ) + { + if ( val != null ) + { + issue.setType( val.get( "name" ).asText() ); + } + } + private void doSessionAuth( WebClient client ) throws IOException, MojoExecutionException, NoRest {