diff --git a/differences/dometahierarchy.groovy b/differences/dometahierarchy.groovy index 06ade92..9adc784 100644 --- a/differences/dometahierarchy.groovy +++ b/differences/dometahierarchy.groovy @@ -184,6 +184,16 @@ def jiraticketexists(String jiraticket) { return [true, URI] } +class JiraTicketInfo { + String jiranumber + String uri + + JiraTicketInfo() { + jiranumber = '' + uri = '' + } +} + def extractjiraticketinfo(String line) { def List jiratickets = [] boolean exists = false @@ -197,8 +207,10 @@ def extractjiraticketinfo(String line) { jiraticket = match1.group(1) (exists, URI) = jiraticketexists(jiraticket) if (exists) { - def jiraticketmap = ['jiraticket' : jiraticket, 'uri' : URI] - jiratickets.add(jiraticketmap) + def JiraTicketInfo j = new JiraTicketInfo + j.jiranumber = jiraticket + j.uri = URI + jiratickets.add(j) line = match1.group(2) } else { break @@ -210,8 +222,10 @@ def extractjiraticketinfo(String line) { jiraticket = match2.group(1) + "-" + match2.group(2) (exists, URI) = jiraticketexists(jiraticket) if (exists) { - def jiraticketmap = ['jiraticket' : jiraticket, 'uri' : URI] - jiratickets.add(jiraticketmap) + def JiraTicketInfo j = new JiraTicketInfo + j.jiranumber = jiraticket + j.uri = URI + jiratickets.add(j) line = match2.group(3) } else { break @@ -223,8 +237,10 @@ def extractjiraticketinfo(String line) { jiraticket = match3.group(1) + "-" + match3.group(2) (exists, URI) = jiraticketexists(jiraticket) if (exists) { - def jiraticketmap = ['jiraticket' : jiraticket, 'uri' : URI] - jiratickets.add(jiraticketmap) + def JiraTicketInfo j = new JiraTicketInfo + j.jiranumber = jiraticket + j.uri = URI + jiratickets.add(j) line = match3.group(3) } else { break @@ -347,73 +363,137 @@ def addedcomponent(latermetaitems, key) { summaryappend("Added ") } -def mergereport(String reportsubfolder, merges, boolean iscomponent = true) { +class MergeReportRecord { + String comment + int duplicates + + MergeReportRecord() { + comment = '' + duplicates = 0 + } +} + +def mergereport(String reportsubfolder, LinkedHashMap merges, boolean iscomponent = true) { dir(reportsubfolder) { - String mergelist = "Merge list:\n" - mergessorted = merges.sort() + def String mergelist = "Merge list:\n" + def mergessorted = merges.sort() for (amerge in mergessorted) { - mergelist += "${amerge.key}\n" + def MergeReportRecord m = amerge.value + mergelist += "${m.comment} (${m.duplicates()})\n" } writeFile(file: "mergelist.txt", text: mergelist) } } -def revertsreport(String reportsubfolder, reverts, boolean iscomponent = true) { +class CommentsRecord { + String comment + int duplicates + + CommentsRecord() { + comment = '' + duplicates = 0 + } +} + +class RevertsReportRecord { + String jiraticket + String ticketURI + LinkedHashMap commentscollection + + RevertsReportRecord() { + jiraticket = '' + ticketURI = '' + commentscollection = new LinkedHashMap() + } +} + +def revertsreport(String reportsubfolder, LinkedHashMap reverts, boolean iscomponent = true) { dir(reportsubfolder) { - String revertlist = "Revert list:\n" - revertssorted = reverts.toSorted { a, b -> a.key['jiraticket'] <=> b.key['jiraticket'] } + def String revertlist = "Revert list:\n" + def revertssorted = reverts.sort() for (arevert in revertssorted) { - revertlist += "${arevert.key['jiraticket']}: ${arevert.key['uri']}\n" - for (revertlistcomment in arevert.value) { - revertlist += "${revertlistcomment.key} (${revertlistcomment.value})\n" + def RevertsReportRecord r = arevert.value + revertlist += "${r.jiraticket} (${r.ticketURI}):\n" + def commentscollection = r.commentscollection + def sortedcommentscollection = commentscollection.sort() + for (commentrecord in sortedcommentscollection) { + revertlist += "${commentrecord.comment} (${commentrecord.duplicates})\n" } } writeFile(file: "revertlist.txt", text: revertlist) } } -def ticketedreport(String reportsubfolder, ticketed, boolean iscomponent = true) { +class TicketedReportRecord { + String jiraticket + String ticketURI + LinkedHashMap commentscollection + + TicketedReportRecord() { + jiraticket = '' + ticketURI = '' + commentscollection = new LinkedHashMap() + } +} + +def ticketedreport(String reportsubfolder, LinkedHashMap ticketed, boolean iscomponent = true) { dir(reportsubfolder) { - String ticketedlist = "Ticketed list:\n" - echo "ticketed: ${ticketed}" - for (ticket in ticketed) { - echo "|${ticket.key['jiraticket']}(${ticket.key['jiraticket'].getClass()})|\n|${ticket.key['uri']}(${ticket.key['uri'].getClass()})|\n" - for (comment in ticket.value) { - echo "|${comment.key}(${comment.key.getClass()})|${comment.value}(${comment.value.getClass()})|\n" - } - } - ticketedsorted = ticketed.toSorted { a, b -> a.key['jiraticket'] <=> b.key['jiraticket'] } - echo "ticketedsorted: ${ticketedsorted}" + def String ticketedlist = "Ticketed list:\n" + def ticketedsorted = ticketed.sort() for (aticketed in ticketedsorted) { - echo "aticketed: ${aticketed}" - ticketedlist += "${aticketed.key['jiraticket']}: ${aticketed.key['uri']}\n" - for (ticketedlistcomment in aticketed.value) { - ticketedlist += "${ticketedlistcomment.key} (${ticketedlistcomment.value})\n" + def TicketedReportRecord r = aticket.value + ticketedlist += "${r.jiraticket} (${r.ticketURI}):\n" + def commentscollection = r.commentscollection + def sortedcommentscollection = commentscollection.sort() + for (commentrecord in sortedcommentscollection) { + ticketedlist += "${commentrecord.comment} (${commentrecord.duplicates})\n" } } writeFile(file: "ticketedlist.txt", text: ticketedlist) } } -//ticket: [jiraticket:GIS-7312, uri:https://jira.gisapps.co.uk/browse/GIS-7312] revert[ticket]: [- The download of the latest 'sentinel super pro' drivers and placed next to the original dongle drivers.:1] +class UnticketedReportRecord { + String comment + int duplicates + + UnticketedReportRecord() { + comment = '' + duplicates = 0 + } +} -def unticketedreport(String reportsubfolder, unticketed, boolean iscomponent = true) { +def unticketedreport(String reportsubfolder, LinkedHashMap unticketed, boolean iscomponent = true) { dir(reportsubfolder) { - String unticketedlist = "Unticketed list:\n" - unticketedsorted = unticketed.sort() + def String unticketedlist = "Unticketed list:\n" + def unticketedsorted = unticketed.sort() for (anunticketed in unticketedsorted) { - unticketedlist += "${anunticketed.key} (${anunticketed.value})\n" + UnticketedReportRecord u = anunticketed.value + unticketedlist += "${u.comment} (${u.duplicates})\n" } writeFile(file: "unticketedlist.txt", text: unticketedlist) } } +class TicketsReportRecord { + String jiraticket + String ticketURI + int duplicates + + TicketsReportRecord() { + jiraticket = '' + ticketURI = '' + duplicates = 0 + } +} + def ticketsreport(String reportsubfolder, tickets, boolean iscomponent = true) { dir(reportsubfolder) { String ticketlist = "Ticket list:\n" - ticketssorted = tickets.toSorted { a, b -> a.key['jiraticket'] <=> b.key['jiraticket'] } + ticketssorted = tickets.sort() for (ticketnumber in ticketssorted) { - ticketlist += "${ticketnumber.key['jiraticket']}: ${ticketnumber.key['uri']} (${ticketnumber.value})\n" + TicketsReportRecord t = ticketnumber.value + ticketlist += "${t.jiraticket} (${t.ticketURI}) (${t.duplicates})\n" } writeFile(file: "ticketlist.txt", text: ticketlist) } @@ -438,60 +518,108 @@ def boolean report(meta, differencerecords, boolean iscomponent = true) { for (dr in differencerecords) { if (dr.type == "Merge") { - merges[dr.mergeinfo] = dr + def MergeReportRecord m + if (!merges.containsKey(dr.mergeinfo)) { + m = new MergeReportRecord() + m.comment = dr.mergeinfo + m.duplicate = 1 + } else { + m = merges[dr.mergeinfo] + m.duplicate += 1 + } + merges[dr.mergeinfo] = m } if (dr.type == "Revert") { + def RevertsReportRecord r for (ticket in dr.jiraticketinfo) { - def comments = [:] - if (!reverts.containsKey(ticket)) { - reverts[ticket] = [:] - comments = reverts[ticket] - comments[dr.comment] = 1 + JiraTicketInfo j = ticket + if (!reverts.containsKey(j.jiranumber)) { + r = new RevertsReportRecord() + r.jiraticket = j.jiranumber + r.ticketURI = j.uri + CommentsRecord c = mew CommentsRecord() + c.comment = dr.comment + c.duplicates = 1 + r.commentscollection[dr.comment] = c } else { - comments = reverts[ticket] - if (!comments.containsKey(dr.comment)) { - comments[dr.comment] = 1 + r = reverts[j.jiranumber] + def CommentsRecord c + if (!r.commentscollection.containsKey(dr.comment)) { + c = mew CommentsRecord() + c.comment = dr.comment + c.duplicates = 1 + r.commentscollection[dr.comment] = c } else { - comments[dr.comment] += 1 + c = r.commentscollection[dr.comment] + c.duplicates += 1 } + r.commentscollection[dr.comment] = c } - reverts[ticket] = comments - if (!tickets.containsKey(ticket)) { - tickets[ticket] = 1 + reverts[j.jiranumber] = r + def TicketsReportRecord t + if (!tickets.containsKey(j.jiranumber)) { + t = new TicketsReportRecord() + t.jiraticket = j.jiranumber + t.ticketURI = j.uri + t.duplicates = 1 } else { - tickets[ticket] += 1 + t = tickets[j.jiranumber] + t.duplicates += 1 } + tickets[j.jiranumber] = t } } if (dr.type == "Ticketed") { + def TicketedReportRecord t for (ticket in dr.jiraticketinfo) { - def comments = [:] - if (!ticketed.containsKey(ticket)) { - ticketed[ticket] = [:] - comments = ticketed[ticket] - comments[dr.comment] = 1 + JiraTicketInfo j = ticket + if (!ticketed.containsKey(j.jiranumber)) { + t = new TicketedReportRecord() + t.jiraticket = j.jiranumber + t.ticketURI = j.uri + CommentsRecord c = mew CommentsRecord() + c.comment = dr.comment + c.duplicates = 1 + t.commentscollection[dr.comment] = c } else { - comments = ticketed[ticket] - if (!comments.containsKey(dr.comment)) { - comments[dr.comment] = 1 + t = ticketed[j.jiranumber] + def CommentsRecord c + if (!t.commentscollection.containsKey(dr.comment)) { + c = mew CommentsRecord() + c.comment = dr.comment + c.duplicates = 1 + t.commentscollection[dr.comment] = c } else { - comments[dr.comment] += 1 + c = t.commentscollection[dr.comment] + c.duplicates += 1 } + t.commentscollection[dr.comment] = c } - ticketed[ticket] = comments - if (!tickets.containsKey(ticket)) { - tickets[ticket] = 1 + ticketed[j.jiranumber] = t + def TicketsReportRecord t + if (!tickets.containsKey(j.jiranumber)) { + t = new TicketsReportRecord() + t.jiraticket = j.jiranumber + t.ticketURI = j.uri + t.duplicates = 1 } else { - tickets[ticket] += 1 + t = tickets[j.jiranumber] + t.duplicates += 1 } + tickets[j.jiranumber] = t } } if (dr.type == "Unticketed") { + UnticketedReportRecord u if (!unticketed.containsKey(dr.comment)) { - unticketed[dr.comment] = 1 + u = new UnticketedReportRecord() + u.comment = dr.comment + u.duplicates = 1 } else { - unticketed[dr.comment] += 1 + u = unticketed[dr.comment] + u.duplicates += 1 } + unticketed[dr.comment] = u } } String reportsubfolder = ""