diff --git a/differences/dometahierarchy.groovy b/differences/dometahierarchy.groovy index a1ed656..4401059 100644 --- a/differences/dometahierarchy.groovy +++ b/differences/dometahierarchy.groovy @@ -10,6 +10,20 @@ tempfolder = "${WORKSPACE}/temp" reportfolder = "${WORKSPACE}/reports" +class JiraTicketInfo { + String jiranumber + String uri + + JiraTicketInfo() { + jiranumber = '' + uri = '' + } + + def String dump() { + return "jiranumber: ${jiranumber} uri: ${uri}" + } +} + class DifferenceRecord { String productname String subcomponentname @@ -19,7 +33,7 @@ class DifferenceRecord { String sha String type String mergeinfo - List jiraticketinfo + List jiraticketinfo String comment DifferenceRecord() { @@ -31,7 +45,7 @@ class DifferenceRecord { sha = "" type = "" mergeinfo = "" - jiraticketinfo = [] + jiraticketinfo = new List comment = "" } @@ -184,20 +198,6 @@ def jiraticketexists(String jiraticket) { return [true, URI] } -class JiraTicketInfo { - String jiranumber - String uri - - JiraTicketInfo() { - jiranumber = '' - uri = '' - } - - def String dump() { - return "jiranumber: ${jiranumber} uri: ${uri}" - } -} - def extractjiraticketinfo(String line) { def List jiratickets = [] boolean exists = false @@ -541,7 +541,7 @@ def boolean report(meta, differencerecords, boolean iscomponent = true) { r = new RevertsReportRecord() r.jiraticket = j.jiranumber r.ticketURI = j.uri - CommentsRecord c = mew CommentsRecord() + CommentsRecord c = new CommentsRecord() c.comment = dr.comment c.duplicates = 1 r.commentscollection[dr.comment] = c @@ -549,7 +549,7 @@ def boolean report(meta, differencerecords, boolean iscomponent = true) { r = reverts[j.jiranumber] def CommentsRecord c if (!r.commentscollection.containsKey(dr.comment)) { - c = mew CommentsRecord() + c = new CommentsRecord() c.comment = dr.comment c.duplicates = 1 r.commentscollection[dr.comment] = c @@ -581,7 +581,7 @@ def boolean report(meta, differencerecords, boolean iscomponent = true) { t = new TicketedReportRecord() t.jiraticket = j.jiranumber t.ticketURI = j.uri - CommentsRecord c = mew CommentsRecord() + CommentsRecord c = new CommentsRecord() c.comment = dr.comment c.duplicates = 1 t.commentscollection[dr.comment] = c @@ -589,7 +589,7 @@ def boolean report(meta, differencerecords, boolean iscomponent = true) { t = ticketed[j.jiranumber] def CommentsRecord c if (!t.commentscollection.containsKey(dr.comment)) { - c = mew CommentsRecord() + c = new CommentsRecord() c.comment = dr.comment c.duplicates = 1 t.commentscollection[dr.comment] = c