From 74ad66b19964a07c2b14ea0a727234db1446dd49 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 10 Dec 2021 17:10:24 +0000 Subject: [PATCH] Start writing format version into meta data file --- meta/folder.groovy | 49 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index d67389f..70d024a 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -20,12 +20,14 @@ abstract class GISJsonSerialised implements Serializable { } class ProductInfo extends GISJsonSerialised { + private static String FORMAT = '0.1' String productname String subcomponentname String variant ProductInfo(script, productname = "", subcomponentname = "", variant = "") { super(script) + this.format = FORMAT this.productname = productname this.subcomponentname = subcomponentname this.variant = variant @@ -77,6 +79,7 @@ class ProductInfo extends GISJsonSerialised { } void deserialiseJson(rawmeta) { + //format = rawmeta['format'] productname = rawmeta['productname'] subcomponentname = rawmeta['subcomponentname'] variant = rawmeta['variant'] ?: "" @@ -84,6 +87,7 @@ class ProductInfo extends GISJsonSerialised { LinkedHashMap serialisationdata() { def data = [ + 'format' : format, 'productname' : productname, 'subcomponentname' : subcomponentname, 'variant' : variant, @@ -93,6 +97,7 @@ class ProductInfo extends GISJsonSerialised { } class GitInfo extends GISJsonSerialised { + private static String FORMAT = '0.1' private String sourcepath private String sourcerevision private String gitrevision @@ -101,6 +106,7 @@ class GitInfo extends GISJsonSerialised { GitInfo(script, sourcepath = "", sourcerevision = "", gitrevision = "", remoteurl = "", remoteinfo = "") { super(script) + this.format = FORMAT this.sourcepath = sourcepath this.sourcerevision = sourcerevision this.gitrevision = gitrevision @@ -134,6 +140,7 @@ class GitInfo extends GISJsonSerialised { } void deserialiseJson(rawmeta) { + //format = rawmeta['format'] sourcepath = rawmeta['sourcepath'] sourcerevision = rawmeta['sourcerevision'] gitrevision = rawmeta['gitrevision'] @@ -143,6 +150,7 @@ class GitInfo extends GISJsonSerialised { LinkedHashMap serialisationdata() { def data = [ + 'format' : format, 'sourcepath' : sourcepath, 'sourcerevision' : sourcerevision, 'gitrevision' : gitrevision, @@ -154,12 +162,14 @@ class GitInfo extends GISJsonSerialised { } class JenkinsBuildParameter extends GISJsonSerialised { + private static String FORMAT = '0.1' private String name private String valuetype private String value JenkinsBuildParameter(script, String name = '', String valuetype = '', String value = '') { super(script) + this.format = FORMAT this.name = name this.valuetype = valuetype this.value = value @@ -172,6 +182,7 @@ class JenkinsBuildParameter extends GISJsonSerialised { } void deserialiseJson(rawmeta) { + //format = rawmeta['format'] name = rawmeta['name'] valuetype = rawmeta['valuetype'] value = rawmeta['value'] @@ -179,6 +190,7 @@ class JenkinsBuildParameter extends GISJsonSerialised { LinkedHashMap serialisationdata() { def data = [ + 'format' : format, 'name' : name, 'valuetype' : valuetype, 'value' : value, @@ -188,6 +200,7 @@ class JenkinsBuildParameter extends GISJsonSerialised { } class JenkinsBuildInfo extends GISJsonSerialised { + private static String FORMAT = '0.1' String buildjobname int buildnumber private String buildmachine @@ -197,6 +210,7 @@ class JenkinsBuildInfo extends GISJsonSerialised { JenkinsBuildInfo(script, String buildjobname = "", int buildnumber = 0, String buildmachine = "", String builddate = "", boolean isfullbuild = true) { super(script) + this.format = FORMAT this.buildjobname = buildjobname this.buildnumber = buildnumber this.buildmachine = buildmachine @@ -228,6 +242,7 @@ class JenkinsBuildInfo extends GISJsonSerialised { } void deserialiseJson(rawmeta) { + //format = rawmeta['format'] buildjobname = rawmeta['buildjobname'] buildnumber = rawmeta['buildnumber'] buildmachine = rawmeta['buildmachine'] @@ -253,6 +268,7 @@ class JenkinsBuildInfo extends GISJsonSerialised { LinkedHashMap serialisationdata() { def data = [ + 'format' : format, 'buildjobname' : buildjobname, 'buildnumber' : buildnumber, 'buildmachine' : buildmachine, @@ -265,12 +281,14 @@ class JenkinsBuildInfo extends GISJsonSerialised { } class BuildStampInfo extends GISJsonSerialised { + private static String FORMAT = '0.1' String buildstampprefix int revision String buildstamp BuildStampInfo(script, buildstampprefix = "0.30000.0.", revision = 0, buildstamp = "0.30000.0.0") { super(script) + this.format = FORMAT this.buildstampprefix = buildstampprefix this.revision = revision this.buildstamp = buildstamp @@ -333,6 +351,7 @@ class BuildStampInfo extends GISJsonSerialised { } void deserialiseJson(rawmeta) { + //format = rawmeta['format'] buildstampprefix = rawmeta['buildstampprefix'] revision = rawmeta['revision'] buildstamp = rawmeta['buildstamp'] @@ -340,6 +359,7 @@ class BuildStampInfo extends GISJsonSerialised { LinkedHashMap serialisationdata() { def data = [ + 'format' : format, 'buildstampprefix' : buildstampprefix, 'revision' : revision, 'buildstamp' : buildstamp, @@ -349,12 +369,14 @@ class BuildStampInfo extends GISJsonSerialised { } class ReleaseInfo extends GISJsonSerialised { + private static String FORMAT = '0.1' String releaserepoURL ArrayList releaseitems boolean released ReleaseInfo(script, String releaserepoURL = "", boolean released = false) { super(script) + this.format = FORMAT this.releaserepoURL = releaserepoURL this.releaseitems = new ArrayList() this.released = released @@ -382,6 +404,7 @@ class ReleaseInfo extends GISJsonSerialised { } void deserialiseJson(rawmeta) { + //format = rawmeta['format'] releaserepoURL = rawmeta['releaserepoURL'] releaseitems = new ArrayList() for (rawreleaseitem in rawmeta['releaseitems']) { @@ -392,6 +415,7 @@ class ReleaseInfo extends GISJsonSerialised { LinkedHashMap serialisationdata() { def data = [ + 'format' : format, 'releaserepoURL' : releaserepoURL, 'releaseitems' : releaseitemssserialised(), 'released' : released @@ -401,6 +425,7 @@ class ReleaseInfo extends GISJsonSerialised { } class ConfigurationInfo extends GISJsonSerialised { + private static String FORMAT = '0.1' private String configurationname private String configurationURL private String configurationversion @@ -408,6 +433,7 @@ class ConfigurationInfo extends GISJsonSerialised { ConfigurationInfo(script, configurationname = "", configurationURL = "", configurationversion = "", configurationSHA = "") { super(script) + this.format = FORMAT this.configurationname = configurationname this.configurationURL = configurationURL this.configurationversion = configurationversion @@ -415,6 +441,7 @@ class ConfigurationInfo extends GISJsonSerialised { } void deserialiseJson(rawmeta) { + //format = rawmeta['format'] configurationname = rawmeta['configurationname'] configurationURL = rawmeta['configurationURL'] configurationversion = rawmeta['configurationversion'] @@ -423,6 +450,7 @@ class ConfigurationInfo extends GISJsonSerialised { LinkedHashMap serialisationdata() { def data = [ + 'format' : format, 'configurationname' : configurationname, 'configurationURL' : configurationURL, 'configurationversion' : configurationversion, @@ -457,11 +485,13 @@ class ChecksumPair extends GISJsonSerialised { } class ChecksumSet extends GISJsonSerialised { + private static String FORMAT = '0.1' private String artifactpath private ArrayList checksumpairs ChecksumSet(script, artifactpath = "") { super(script) + this.format = FORMAT this.artifactpath = artifactpath checksumpairs = new ArrayList() } @@ -481,6 +511,7 @@ class ChecksumSet extends GISJsonSerialised { } void deserialiseJson(rawmeta) { + //format = rawmeta['format'] artifactpath = rawmeta['artifactpath'] checksumpairs = new ArrayList() for (rawchecksumpair in rawmeta['checksumpairs']) { @@ -492,6 +523,7 @@ class ChecksumSet extends GISJsonSerialised { LinkedHashMap serialisationdata() { def data = [ + 'format' : format, 'artifactpath' : artifactpath, 'checksumpairs' : checksumpairsserialised(), ] @@ -500,10 +532,12 @@ class ChecksumSet extends GISJsonSerialised { } class ChecksumInfo extends GISJsonSerialised { + private static String FORMAT = '0.1' private ArrayList checksumsets ChecksumInfo(script) { super(script) + this.format = FORMAT checksumsets = new ArrayList() } @@ -522,6 +556,7 @@ class ChecksumInfo extends GISJsonSerialised { } void deserialiseJson(rawmeta) { + //format = rawmeta['format'] checksumsets = new ArrayList() for (rawchecksumset in rawmeta['checksumsets']) { def cs = new ChecksumSet(script) @@ -532,6 +567,7 @@ class ChecksumInfo extends GISJsonSerialised { LinkedHashMap serialisationdata() { def data = [ + 'format' : format, 'checksumsets' : checksumsetsserialised(), ] return data @@ -539,19 +575,23 @@ class ChecksumInfo extends GISJsonSerialised { } class PublishableInfo extends GISJsonSerialised { + private static String FORMAT = '0.1' private String filepath PublishableInfo(script, String filepath = "") { super(script) + this.format = FORMAT this.filepath = filepath } void deserialiseJson(rawmeta) { + //format = rawmeta['format'] filepath = rawmeta['filepath'] } LinkedHashMap serialisationdata() { def data = [ + 'format' : format, 'filepath' : filepath, ] return data @@ -559,9 +599,9 @@ class PublishableInfo extends GISJsonSerialised { } class MetaInfo extends GISJsonSerialised { - private static String FORMAT = "0.1" - private static String METAFOLDERNAME = "meta" - private static String METAFILENAME = "info.json" + private static String FORMAT = '0.1' + private static String METAFOLDERNAME = 'meta' + private static String METAFILENAME = 'info.json' private static String METAARTIFACTS = "${METAFOLDERNAME}/**" class RelatedMetaInfo extends GISJsonSerialised { @@ -570,11 +610,13 @@ class MetaInfo extends GISJsonSerialised { RelatedMetaInfo(script, offsetpath = "", MetaInfo meta = null) { super(script) + this.format = FORMAT this.offsetpath = offsetpath this.meta = meta } void deserialiseJson(rawmeta) { + //format = rawmeta['format'] offsetpath = rawmeta['offsetpath'] meta = new MetaInfo(script) meta.deserialiseJson(rawmeta['meta']) @@ -582,6 +624,7 @@ class MetaInfo extends GISJsonSerialised { LinkedHashMap serialisationdata() { def data = [ + 'format' : format, 'offsetpath' : offsetpath, 'meta' : meta.serialisationdata(), ]