diff options
| author | Brandon Lum <lumjjb@gmail.com> | 2022-07-19 16:43:48 -0400 |
|---|---|---|
| committer | Brandon Lum <lumjjb@gmail.com> | 2022-07-19 22:43:24 -0400 |
| commit | 9ae1bd2f8e0dabb0845f1225b54f23e8f3a429f1 (patch) | |
| tree | a43213aadfb9bde3d9ec15634a39305f19ff38b2 /tvloader/parser2v2/parser.go | |
| parent | 41d2272711255f5a25e16e3507ec3318bc550189 (diff) | |
| download | spdx-tools-9ae1bd2f8e0dabb0845f1225b54f23e8f3a429f1.tar.gz | |
replace all v2_1, v2_2 with new convention
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
Diffstat (limited to 'tvloader/parser2v2/parser.go')
| -rw-r--r-- | tvloader/parser2v2/parser.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tvloader/parser2v2/parser.go b/tvloader/parser2v2/parser.go index 1d9f8e9..72f67be 100644 --- a/tvloader/parser2v2/parser.go +++ b/tvloader/parser2v2/parser.go @@ -6,13 +6,14 @@ package parser2v2 import ( "fmt" - "github.com/spdx/tools-golang/spdx" + "github.com/spdx/tools-golang/spdx/common" + "github.com/spdx/tools-golang/spdx/v2_2" "github.com/spdx/tools-golang/tvloader/reader" ) // ParseTagValues takes a list of (tag, value) pairs, parses it and returns // a pointer to a parsed SPDX Document. -func ParseTagValues(tvs []reader.TagValuePair) (*spdx.Document2_2, error) { +func ParseTagValues(tvs []reader.TagValuePair) (*v2_2.Document, error) { parser := tvParser2_2{} for _, tv := range tvs { err := parser.parsePair2_2(tv.Tag, tv.Value) @@ -58,7 +59,7 @@ func (parser *tvParser2_2) parsePairFromStart2_2(tag string, value string) error // create an SPDX Document data struct if we don't have one already if parser.doc == nil { - parser.doc = &spdx.Document2_2{ExternalDocumentReferences: []spdx.ExternalDocumentRef2_2{}} + parser.doc = &v2_2.Document{ExternalDocumentReferences: []v2_2.ExternalDocumentRef{}} } switch tag { @@ -83,10 +84,10 @@ func (parser *tvParser2_2) parsePairFromStart2_2(tag string, value string) error if err != nil { return err } - edr := spdx.ExternalDocumentRef2_2{ + edr := v2_2.ExternalDocumentRef{ DocumentRefID: documentRefID, URI: uri, - Checksum: spdx.Checksum{Algorithm: spdx.ChecksumAlgorithm(alg), Value: checksum}, + Checksum: common.Checksum{Algorithm: common.ChecksumAlgorithm(alg), Value: checksum}, } parser.doc.ExternalDocumentReferences = append(parser.doc.ExternalDocumentReferences, edr) default: |