Overhaul structs, refactor JSON parser and saver

Signed-off-by: Ian Ling <ian@iancaling.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/rdfloader/parser2v2/license_utils.go b/rdfloader/parser2v2/license_utils.go
index 80b0a71..0a823ef 100644
--- a/rdfloader/parser2v2/license_utils.go
+++ b/rdfloader/parser2v2/license_utils.go
@@ -5,6 +5,7 @@ package parser2v2
 import (
 	"fmt"
 	gordfParser "github.com/spdx/gordf/rdfloader/parser"
+	"github.com/spdx/tools-golang/spdx"
 	"strings"
 )
 
@@ -25,7 +26,7 @@ func getLicenseStringFromURI(uri string) string {
 // returns the checksum algorithm and it's value
 // In the newer versions, these two strings will be bound to a single checksum struct
 // whose pointer will be returned.
-func (parser *rdfParser2_2) getChecksumFromNode(checksumNode *gordfParser.Node) (algorithm string, value string, err error) {
+func (parser *rdfParser2_2) getChecksumFromNode(checksumNode *gordfParser.Node) (algorithm spdx.ChecksumAlgorithm, value string, err error) {
 	var checksumValue, checksumAlgorithm string
 	for _, checksumTriple := range parser.nodeToTriples(checksumNode) {
 		switch checksumTriple.Predicate.ID {
@@ -45,7 +46,7 @@ func (parser *rdfParser2_2) getChecksumFromNode(checksumNode *gordfParser.Node)
 			return
 		}
 	}
-	return checksumAlgorithm, checksumValue, nil
+	return spdx.ChecksumAlgorithm(checksumAlgorithm), checksumValue, nil
 }
 
 func getAlgorithmFromURI(algorithmURI string) (checksumAlgorithm string, err error) {