From 9b2752021245f9a3cfdfbc531eab2176d891240d Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 14 Dec 2021 21:59:26 +0000 Subject: [PATCH] Make all walkers use a walker that understand v0.1 and v0.2 formats --- meta/folder.groovy | 137 ++++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 83 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index dd3a1b7..adf124a 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -893,31 +893,6 @@ class MetaInfo extends GISJsonSerialised { saveJsonSerialised(metafilepath) return artifactlist } - - // Recurse tree of meta looking for release info and accumulate path - Pass by reference unavailable in Groovy/Java - private ArrayList releasewalkerp(int maxdepth, ArrayList releasemetacollection, String pathsofar) { - if (maxdepth > 0) { - if (releaseinfo.releaserepoURL) { - RelatedMetaInfo rmi = new RelatedMetaInfo_v0_1(script, pathsofar, this) - releasemetacollection.add(rmi) - } - if (pathsofar) { - pathsofar += "/" - } - for (relatedmetainfo in associatedmeta) { - MetaInfo othermeta = relatedmetainfo.meta - String newpathsofar = pathsofar + relatedmetainfo.offsetpath - releasemetacollection = othermeta.releasewalkerp(maxdepth - 1, releasemetacollection, newpathsofar) - } - } - return releasemetacollection - } - - ArrayList releasewalker(int maxdepth, String startpath = "") { - ArrayList releasemetacollection = new ArrayList() - releasemetacollection = releasewalkerp(maxdepth, releasemetacollection, startpath) - return releasemetacollection - } String componentidentifier() { return productinfo.productname + "_" + productinfo.subcomponentname @@ -939,44 +914,6 @@ class MetaInfo extends GISJsonSerialised { return buildstampinfo.buildstamp + "-" + jenkinsbuildinfo.buildnumber } - Map putwithshortestoffsetpath(Map releasemetacollection, String uniquestring, RelatedMetaInfo relatedmetainfo) { - if (releasemetacollection.containsKey(uniquestring)) { - def existingentry = releasemetacollection[uniquestring] - if (existingentry.offsetpath.size() > relatedmetainfo.offsetpath.size()) { - releasemetacollection.put(uniquestring, relatedmetainfo) - } - } else { - releasemetacollection.put(uniquestring, relatedmetainfo) - } - return releasemetacollection - } - - Map releasewalkerunique(int maxdepth, String startpath = "") { - def ArrayList releasemetacollection = new ArrayList() - releasemetacollection = releasewalkerp(maxdepth, releasemetacollection, startpath) - - def Map releasemetauniquecollection = new LinkedHashMap() - for (relatedmetainfo in releasemetacollection) { - def String uniquestring = relatedmetainfo.meta.componentidentifier() - releasemetauniquecollection = putwithshortestoffsetpath(releasemetauniquecollection, uniquestring, relatedmetainfo) - } - - return releasemetauniquecollection - } - - Map releasewalkerversionunique(int maxdepth, String startpath = "") { - ArrayList releasemetacollection = new ArrayList() - releasemetacollection = releasewalkerp(maxdepth, releasemetacollection, startpath) - - def Map releasemetaversionuniquecollection = new LinkedHashMap() - for (relatedmetainfo in releasemetacollection) { - def String uniquestring = relatedmetainfo.meta.componentversionuniqueidentifier() - releasemetaversionuniquecollection = putwithshortestoffsetpath(releasemetaversionuniquecollection, uniquestring, relatedmetainfo) - } - - return releasemetaversionuniquecollection - } - def openchildmeta(String gatheredpath, RelatedMetaInfo relatedmetainfo) { def MetaInfo mi = new MetaInfo(script) @@ -1004,40 +941,44 @@ class MetaInfo extends GISJsonSerialised { return childmetainfo } - def walkrelated_v0_1(ArrayList metacollection, String comment = '', int level = 0) { + def walkrelated_v0_1(ArrayList metacollection, String comment = '', int level = 0, boolean limiteddepth = false, int maxdepth = 0) { def results = [ 'metacollection' : metacollection, 'comment': comment ] - results.metacollection.add(this) - results.comment += "${level} ".padRight(level * 4) + globalreleasetag() + '\n' - for (relatedmetainfo in associatedmeta) { - if (!relatedmetainfo.format || relatedmetainfo.format == '0.1') { - def MetaInfo othermeta = relatedmetainfo.meta - results = othermeta.walkrelated_v0_1(results.metacollection, results.comment, level + 1) - } else { - script.error("There is non v0.1 format related meta info under v0.1 related meta info") + if (!limiteddepth || maxdepth > 0) { + results.metacollection.add(this) + results.comment += "${level} ".padRight(level * 4) + globalreleasetag() + '\n' + for (relatedmetainfo in associatedmeta) { + if (!relatedmetainfo.format || relatedmetainfo.format == '0.1') { + def MetaInfo othermeta = relatedmetainfo.meta + results = othermeta.walkrelated_v0_1(results.metacollection, results.comment, level + 1, limiteddepth, maxdepth - 1) + } else { + script.error("There is non v0.1 format related meta info under v0.1 related meta info") + } } } return [ 'metacollection' : results.metacollection, 'comment': results.comment ] } - def walkrelated(ArrayList metacollection, String comment = '', int level = 0, String gatheredpath = '') { + def walkrelated(ArrayList metacollection, String comment = '', int level = 0, String gatheredpath = '', boolean limiteddepth = false, int maxdepth = 0) { def results = [ 'metacollection' : metacollection, 'comment': comment ] - results.metacollection.add(this) - results.comment += "${level} ".padRight(level * 4) + globalreleasetag() + '\n' - for (relatedmetainfo in associatedmeta) { - if (relatedmetainfo.format == '0.2') { - def childmetainfo = openchildmeta(gatheredpath, relatedmetainfo) - if (childmetainfo.imported) { - results = childmetainfo.childmeta.walkrelated(results.metacollection, results.comment, level + 1, childmetainfo.nextpath) + if (!limiteddepth || maxdepth > 0) { + results.metacollection.add(this) + results.comment += "${level} ".padRight(level * 4) + globalreleasetag() + '\n' + for (relatedmetainfo in associatedmeta) { + if (relatedmetainfo.format == '0.2') { + def childmetainfo = openchildmeta(gatheredpath, relatedmetainfo) + if (childmetainfo.imported) { + results = childmetainfo.childmeta.walkrelated(results.metacollection, results.comment, level + 1, childmetainfo.nextpath, limiteddepth, maxdepth - 1) + } + } else if (relatedmetainfo.format == '0.1') { + def MetaInfo othermeta = relatedmetainfo.meta + results = othermeta.walkrelated_v0_1(results.metacollection, results.comment, level + 1, limiteddepth, maxdepth - 1) } - } else if (relatedmetainfo.format == '0.1') { - def MetaInfo othermeta = relatedmetainfo.meta - results = othermeta.walkrelated_v0_1(results.metacollection, results.comment, level + 1) } } return [ 'metacollection' : results.metacollection, 'comment': results.comment ] @@ -1048,6 +989,36 @@ class MetaInfo extends GISJsonSerialised { return walkrelated(metacollection) } + ArrayList releasewalker(int maxdepth, String startpath = '') { + def ArrayList metacollection = new ArrayList() + def results = walkrelated(metacollection, '', 0, startpath, true, maxdepth) + return results.metacollection + } + + Map releasewalkerversionunique(int maxdepth, String startpath = '') { + def ArrayList metacollection = releasewalker(maxdepth, startpath) + + def Map versionuniquecollection = new LinkedHashMap() + for (metainfo in metacollection) { + def String uniquestring = metainfo.componentversionuniqueidentifier() + versionuniquecollection.put(uniquestring, metainfo) + } + + return versionuniquecollection + } + + Map releasewalkerunique(int maxdepth, String startpath = '') { + def ArrayList metacollection = releasewalker(maxdepth, startpath) + + def Map uniquecollection = new LinkedHashMap() + for (metainfo in metacollection) { + def String uniquestring = metainfo.componentidentifier() + uniquecollection.put(uniquestring, metainfo) + } + + return uniquecollection + } + MetaInfo getNewMetaObject(script) { return new MetaInfo(script) }