Merge pull request #45 from RishabhBhatnagar/gordf

Update RDFLoader wrt new ExternalDocumentReference and Change Module Path of GoRdf

go.mod

@@ -1,3 +1,5 @@
 module github.com/spdx/tools-golang
 
 go 1.13
+
+require github.com/spdx/gordf v0.0.0-20201111095634-7098f93598fb

rdfloader/parser2v2/constants.go

@@ -1,6 +1,6 @@
 package parser2v2
 
-import "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
+import "github.com/spdx/gordf/rdfloader/parser"
 
 var (
 	// NAMESPACES

rdfloader/parser2v2/license_utils.go

@@ -2,7 +2,7 @@ package parser2v2
 
 import (
 	"fmt"
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
 	"strings"
 )
 

rdfloader/parser2v2/parse_annotation.go

@@ -5,7 +5,7 @@ package parser2v2
 import (
 	"errors"
 	"fmt"
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
 	"github.com/spdx/tools-golang/spdx"
 )
 

rdfloader/parser2v2/parse_creation_info.go

@@ -4,7 +4,7 @@ package parser2v2
 
 import (
 	"fmt"
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
 	"github.com/spdx/tools-golang/spdx"
 )
 

rdfloader/parser2v2/parse_file.go

@@ -4,7 +4,7 @@ package parser2v2
 
 import (
 	"fmt"
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
 	"github.com/spdx/tools-golang/spdx"
 	"strings"
 )

rdfloader/parser2v2/parse_file_test.go

@@ -2,9 +2,9 @@ package parser2v2
 
 import (
 	"bufio"
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
-	rdfloader2 "github.com/RishabhBhatnagar/gordf/rdfloader/xmlreader"
-	gordfWriter "github.com/RishabhBhatnagar/gordf/rdfwriter"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
+	rdfloader2 "github.com/spdx/gordf/rdfloader/xmlreader"
+	gordfWriter "github.com/spdx/gordf/rdfwriter"
 	"github.com/spdx/tools-golang/spdx"
 	"strings"
 	"testing"

rdfloader/parser2v2/parse_license.go

@@ -4,8 +4,8 @@ package parser2v2
 
 import (
 	"fmt"
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
-	"github.com/RishabhBhatnagar/gordf/rdfwriter"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
+	"github.com/spdx/gordf/rdfwriter"
 	"strings"
 )
 

rdfloader/parser2v2/parse_license_test.go

@@ -1,7 +1,7 @@
 package parser2v2
 
 import (
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
 	"reflect"
 	"sort"
 	"testing"

rdfloader/parser2v2/parse_other_license_info.go

@@ -4,8 +4,8 @@ package parser2v2
 
 import (
 	"fmt"
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
-	"github.com/RishabhBhatnagar/gordf/rdfwriter"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
+	"github.com/spdx/gordf/rdfwriter"
 	"github.com/spdx/tools-golang/spdx"
 )
 

rdfloader/parser2v2/parse_other_license_info_test.go

@@ -1,7 +1,7 @@
 package parser2v2
 
 import (
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
 	"reflect"
 	"testing"
 )

rdfloader/parser2v2/parse_package.go

@@ -4,7 +4,7 @@ package parser2v2
 
 import (
 	"fmt"
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
 	"github.com/spdx/tools-golang/spdx"
 	"strings"
 )

rdfloader/parser2v2/parse_package_test.go

@@ -1,7 +1,7 @@
 package parser2v2
 
 import (
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
 	"github.com/spdx/tools-golang/spdx"
 	"reflect"
 	"testing"

rdfloader/parser2v2/parse_relationship.go

@@ -4,8 +4,8 @@ package parser2v2
 
 import (
 	"fmt"
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
-	"github.com/RishabhBhatnagar/gordf/rdfwriter"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
+	"github.com/spdx/gordf/rdfwriter"
 	"github.com/spdx/tools-golang/spdx"
 	"strings"
 )

rdfloader/parser2v2/parse_relationship_test.go

@@ -1,7 +1,7 @@
 package parser2v2
 
 import (
-	"github.com/RishabhBhatnagar/gordf/rdfwriter"
+	"github.com/spdx/gordf/rdfwriter"
 	"github.com/spdx/tools-golang/spdx"
 	"reflect"
 	"testing"

rdfloader/parser2v2/parse_review.go

@@ -4,7 +4,7 @@ package parser2v2
 
 import (
 	"fmt"
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
 	"github.com/spdx/tools-golang/spdx"
 )
 

rdfloader/parser2v2/parse_snippet_info.go

@@ -4,8 +4,8 @@ package parser2v2
 
 import (
 	"fmt"
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
-	"github.com/RishabhBhatnagar/gordf/rdfwriter"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
+	"github.com/spdx/gordf/rdfwriter"
 	"github.com/spdx/tools-golang/spdx"
 	"strconv"
 )

rdfloader/parser2v2/parse_snippet_info_test.go

@@ -1,7 +1,7 @@
 package parser2v2
 
 import (
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
 	"github.com/spdx/tools-golang/spdx"
 	"testing"
 )

rdfloader/parser2v2/parse_spdx_document.go

@@ -4,7 +4,7 @@ package parser2v2
 
 import (
 	"fmt"
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
 	"github.com/spdx/tools-golang/spdx"
 )
 
@@ -42,9 +42,12 @@ func (parser *rdfParser2_2) parseSpdxDocumentNode(spdxDocNode *gordfParser.Node)
 			ci.DocumentName = objectValue
 		case SPDX_EXTERNAL_DOCUMENT_REF: // 2.6: externalDocumentReferences
 			// cardinality: min 0
-			var extRef string
+			var extRef spdx.ExternalDocumentRef2_2
 			extRef, err = parser.getExternalDocumentRefFromNode(subTriple.Object)
-			ci.ExternalDocumentReferences = append(ci.ExternalDocumentReferences, extRef)
+			if err != nil {
+				return err
+			}
+			ci.ExternalDocumentReferences[extRef.DocumentRefID] = extRef
 		case SPDX_CREATION_INFO: // 2.7 - 2.10:
 			// cardinality: exactly 1
 			err = parser.parseCreationInfoFromNode(ci, subTriple.Object)
@@ -86,31 +89,28 @@ func (parser *rdfParser2_2) parseSpdxDocumentNode(spdxDocNode *gordfParser.Node)
 	return nil
 }
 
-func (parser *rdfParser2_2) getExternalDocumentRefFromNode(node *gordfParser.Node) (string, error) {
-	var docID, checksumValue, checksumAlgorithm, spdxDocument string
-	var err error
+func (parser *rdfParser2_2) getExternalDocumentRefFromNode(node *gordfParser.Node) (edr spdx.ExternalDocumentRef2_2, err error) {
 	for _, triple := range parser.nodeToTriples(node) {
 		switch triple.Predicate.ID {
 		case SPDX_EXTERNAL_DOCUMENT_ID:
 			// cardinality: exactly 1
-			docID = triple.Object.ID
+			edr.DocumentRefID = triple.Object.ID
 		case SPDX_SPDX_DOCUMENT:
 			// cardinality: exactly 1
 			// assumption: "spdxDocument" property of an external document
 			// reference is just a uri which doesn't follow a spdxDocument definition
-			spdxDocument = triple.Object.ID
+			edr.URI = triple.Object.ID
 		case SPDX_CHECKSUM:
 			// cardinality: exactly 1
-			checksumAlgorithm, checksumValue, err = parser.getChecksumFromNode(triple.Object)
+			edr.Alg, edr.Checksum, err = parser.getChecksumFromNode(triple.Object)
 			if err != nil {
-				return "", err
+				return edr, err
 			}
 		case RDF_TYPE:
 			continue
 		default:
-			return "", fmt.Errorf("unknown predicate ID (%s) while parsing externalDocumentReference", triple.Predicate.ID)
+			return edr, fmt.Errorf("unknown predicate ID (%s) while parsing externalDocumentReference", triple.Predicate.ID)
 		}
 	}
-	// transform the variables into string form (same as that of tag-value).
-	return fmt.Sprintf("%s %s %s: %s", docID, spdxDocument, checksumAlgorithm, checksumValue), nil
+	return edr, nil
 }

rdfloader/parser2v2/parse_spdx_document_test.go

@@ -1,7 +1,7 @@
 package parser2v2
 
 import (
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
 	"testing"
 )
 

rdfloader/parser2v2/parser.go

@@ -5,8 +5,8 @@ package parser2v2
 import (
 	"errors"
 	"fmt"
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
-	gordfWriter "github.com/RishabhBhatnagar/gordf/rdfwriter"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
+	gordfWriter "github.com/spdx/gordf/rdfwriter"
 	"github.com/spdx/tools-golang/spdx"
 )
 
@@ -16,7 +16,9 @@ func NewParser2_2(gordfParserObj *gordfParser.Parser, nodeToTriples map[string][
 		gordfParserObj:      gordfParserObj,
 		nodeStringToTriples: nodeToTriples,
 		doc: &spdx.Document2_2{
-			CreationInfo:    &spdx.CreationInfo2_2{},
+			CreationInfo: &spdx.CreationInfo2_2{
+				ExternalDocumentReferences: map[string]spdx.ExternalDocumentRef2_2{},
+			},
 			Packages:        map[spdx.ElementID]*spdx.Package2_2{},
 			UnpackagedFiles: map[spdx.ElementID]*spdx.File2_2{},
 			OtherLicenses:   []*spdx.OtherLicense2_2{},

rdfloader/parser2v2/types.go

@@ -3,7 +3,7 @@
 package parser2v2
 
 import (
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
 	"github.com/spdx/tools-golang/spdx"
 )
 

rdfloader/parser2v2/utils.go

@@ -3,9 +3,9 @@ package parser2v2
 import (
 	"errors"
 	"fmt"
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
-	"github.com/RishabhBhatnagar/gordf/rdfwriter"
-	urilib "github.com/RishabhBhatnagar/gordf/uri"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
+	"github.com/spdx/gordf/rdfwriter"
+	urilib "github.com/spdx/gordf/uri"
 	"github.com/spdx/tools-golang/spdx"
 	"strings"
 )

rdfloader/parser2v2/utils_test.go

@@ -1,7 +1,7 @@
 package parser2v2
 
 import (
-	gordfParser "github.com/RishabhBhatnagar/gordf/rdfloader/parser"
+	gordfParser "github.com/spdx/gordf/rdfloader/parser"
 	"github.com/spdx/tools-golang/spdx"
 	"reflect"
 	"testing"

rdfloader/rdfloader.go

@@ -1,7 +1,7 @@
 package rdfloader
 
 import (
-	"github.com/RishabhBhatnagar/gordf/rdfloader"
+	"github.com/spdx/gordf/rdfloader"
 	"github.com/spdx/tools-golang/rdfloader/parser2v2"
 	"github.com/spdx/tools-golang/spdx"
 	"io"

spdx/creation_info.go

@@ -28,7 +28,7 @@ type CreationInfo2_1 struct {
 
 	// 2.6: External Document References
 	// Cardinality: optional, one or many
-	ExternalDocumentReferences []string
+	ExternalDocumentReferences map[string]ExternalDocumentRef2_1
 
 	// 2.7: License List Version
 	// Cardinality: optional, one
@@ -54,6 +54,25 @@ type CreationInfo2_1 struct {
 	DocumentComment string
 }
 
+// ExternalDocumentRef2_1 is a reference to an external SPDX document
+// as defined in section 2.6 for version 2.1 of the spec.
+type ExternalDocumentRef2_1 struct {
+
+	// DocumentRefID is the ID string defined in the start of the
+	// reference. It should _not_ contain the "DocumentRef-" part
+	// of the mandatory ID string.
+	DocumentRefID string
+
+	// URI is the URI defined for the external document
+	URI string
+
+	// Alg is the type of hash algorithm used, e.g. "SHA1", "SHA256"
+	Alg string
+
+	// Checksum is the actual hash data
+	Checksum string
+}
+
 // CreationInfo2_2 is a Document Creation Information section of an
 // SPDX Document for version 2.2 of the spec.
 type CreationInfo2_2 struct {
@@ -80,7 +99,7 @@ type CreationInfo2_2 struct {
 
 	// 2.6: External Document References
 	// Cardinality: optional, one or many
-	ExternalDocumentReferences []string
+	ExternalDocumentReferences map[string]ExternalDocumentRef2_2
 
 	// 2.7: License List Version
 	// Cardinality: optional, one
@@ -105,3 +124,22 @@ type CreationInfo2_2 struct {
 	// Cardinality: optional, one
 	DocumentComment string
 }
+
+// ExternalDocumentRef2_2 is a reference to an external SPDX document
+// as defined in section 2.6 for version 2.2 of the spec.
+type ExternalDocumentRef2_2 struct {
+
+	// DocumentRefID is the ID string defined in the start of the
+	// reference. It should _not_ contain the "DocumentRef-" part
+	// of the mandatory ID string.
+	DocumentRefID string
+
+	// URI is the URI defined for the external document
+	URI string
+
+	// Alg is the type of hash algorithm used, e.g. "SHA1", "SHA256"
+	Alg string
+
+	// Checksum is the actual hash data
+	Checksum string
+}