replace all v2_1, v2_2 with new convention

Signed-off-by: Brandon Lum <lumjjb@gmail.com>

7 files changed, 43 insertions, 38 deletions

diff --git a/builder/builder2v2/build_creation_info.go b/builder/builder2v2/build_creation_info.go
index c24d2d3..74b43fb 100644
--- a/builder/builder2v2/build_creation_info.go
+++ b/builder/builder2v2/build_creation_info.go
@@ -5,7 +5,8 @@ package builder2v2
 import (
 	"time"
 
-	"github.com/spdx/tools-golang/spdx"
+	"github.com/spdx/tools-golang/spdx/common"
+	"github.com/spdx/tools-golang/spdx/v2_2"
 )
 
 // BuildCreationInfoSection2_2 creates an SPDX Package (version 2.2), returning that
@@ -16,9 +17,9 @@ import (
 //   - creatorType: one of Person, Organization or Tool
 //   - creator: creator string
 //   - testValues: for testing only; call with nil when using in production
-func BuildCreationInfoSection2_2(creatorType string, creator string, testValues map[string]string) (*spdx.CreationInfo2_2, error) {
+func BuildCreationInfoSection2_2(creatorType string, creator string, testValues map[string]string) (*v2_2.CreationInfo, error) {
 	// build creator slices
-	creators := []spdx.Creator{
+	creators := []common.Creator{
 		// add builder as a tool
 		{
 			Creator:     "github.com/spdx/tools-golang/builder",
@@ -38,7 +39,7 @@ func BuildCreationInfoSection2_2(creatorType string, creator string, testValues
 		created = testVal
 	}
 
-	ci := &spdx.CreationInfo2_2{
+	ci := &v2_2.CreationInfo{
 		Creators: creators,
 		Created:  created,
 	}
diff --git a/builder/builder2v2/build_file.go b/builder/builder2v2/build_file.go
index efdd979..4e69f58 100644
--- a/builder/builder2v2/build_file.go
+++ b/builder/builder2v2/build_file.go
@@ -6,7 +6,8 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"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/utils"
 )
 
@@ -15,7 +16,7 @@ import (
 //   - filePath: path to file, relative to prefix
 //   - prefix: relative directory for filePath
 //   - fileNumber: integer index (unique within package) to use in identifier
-func BuildFileSection2_2(filePath string, prefix string, fileNumber int) (*spdx.File2_2, error) {
+func BuildFileSection2_2(filePath string, prefix string, fileNumber int) (*v2_2.File, error) {
 	// build the full file path
 	p := filepath.Join(prefix, filePath)
 
@@ -29,20 +30,20 @@ func BuildFileSection2_2(filePath string, prefix string, fileNumber int) (*spdx.
 	i := fmt.Sprintf("File%d", fileNumber)
 
 	// now build the File section
-	f := &spdx.File2_2{
+	f := &v2_2.File{
 		FileName:           filePath,
-		FileSPDXIdentifier: spdx.ElementID(i),
-		Checksums: []spdx.Checksum{
+		FileSPDXIdentifier: common.ElementID(i),
+		Checksums: []common.Checksum{
 			{
-				Algorithm: spdx.SHA1,
+				Algorithm: common.SHA1,
 				Value:     ssha1,
 			},
 			{
-				Algorithm: spdx.SHA256,
+				Algorithm: common.SHA256,
 				Value:     ssha256,
 			},
 			{
-				Algorithm: spdx.MD5,
+				Algorithm: common.MD5,
 				Value:     smd5,
 			},
 		},
diff --git a/builder/builder2v2/build_file_test.go b/builder/builder2v2/build_file_test.go
index 74a6a6a..8691583 100644
--- a/builder/builder2v2/build_file_test.go
+++ b/builder/builder2v2/build_file_test.go
@@ -5,7 +5,7 @@ package builder2v2
 import (
 	"testing"
 
-	"github.com/spdx/tools-golang/spdx"
+	"github.com/spdx/tools-golang/spdx/common"
 )
 
 // ===== File section builder tests =====
@@ -25,21 +25,21 @@ func TestBuilder2_2CanBuildFileSection(t *testing.T) {
 	if file1.FileName != "/file1.testdata.txt" {
 		t.Errorf("expected %v, got %v", "/file1.testdata.txt", file1.FileName)
 	}
-	if file1.FileSPDXIdentifier != spdx.ElementID("File17") {
+	if file1.FileSPDXIdentifier != common.ElementID("File17") {
 		t.Errorf("expected %v, got %v", "File17", file1.FileSPDXIdentifier)
 	}
 
 	for _, checksum := range file1.Checksums {
 		switch checksum.Algorithm {
-		case spdx.SHA1:
+		case common.SHA1:
 			if checksum.Value != "024f870eb6323f532515f7a09d5646a97083b819" {
 				t.Errorf("expected %v, got %v", "024f870eb6323f532515f7a09d5646a97083b819", checksum.Value)
 			}
-		case spdx.SHA256:
+		case common.SHA256:
 			if checksum.Value != "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf" {
 				t.Errorf("expected %v, got %v", "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf", checksum.Value)
 			}
-		case spdx.MD5:
+		case common.MD5:
 			if checksum.Value != "37c8208479dfe42d2bb29debd6e32d4a" {
 				t.Errorf("expected %v, got %v", "37c8208479dfe42d2bb29debd6e32d4a", checksum.Value)
 			}
diff --git a/builder/builder2v2/build_package.go b/builder/builder2v2/build_package.go
index 9c460da..7cccf63 100644
--- a/builder/builder2v2/build_package.go
+++ b/builder/builder2v2/build_package.go
@@ -4,11 +4,13 @@ package builder2v2
 
 import (
 	"fmt"
-	"github.com/spdx/tools-golang/spdx"
-	"github.com/spdx/tools-golang/utils"
 	"path/filepath"
 	"regexp"
 	"runtime"
+
+	"github.com/spdx/tools-golang/spdx/common"
+	"github.com/spdx/tools-golang/spdx/v2_2"
+	"github.com/spdx/tools-golang/utils"
 )
 
 // BuildPackageSection2_2 creates an SPDX Package (version 2.2), returning
@@ -16,7 +18,7 @@ import (
 //   - packageName: name of package / directory
 //   - dirRoot: path to directory to be analyzed
 //   - pathsIgnore: slice of strings for filepaths to ignore
-func BuildPackageSection2_2(packageName string, dirRoot string, pathsIgnore []string) (*spdx.Package2_2, error) {
+func BuildPackageSection2_2(packageName string, dirRoot string, pathsIgnore []string) (*v2_2.Package, error) {
 	// build the file section first, so we'll have it available
 	// for calculating the package verification code
 	filepaths, err := utils.GetAllFilePaths(dirRoot, pathsIgnore)
@@ -35,7 +37,7 @@ func BuildPackageSection2_2(packageName string, dirRoot string, pathsIgnore []st
 		dirRootLen = len(dirRoot)
 	}
 
-	files := []*spdx.File2_2{}
+	files := []*v2_2.File{}
 	fileNumber := 0
 	for _, fp := range filepaths {
 		newFilePatch := ""
@@ -59,9 +61,9 @@ func BuildPackageSection2_2(packageName string, dirRoot string, pathsIgnore []st
 	}
 
 	// now build the package section
-	pkg := &spdx.Package2_2{
+	pkg := &v2_2.Package{
 		PackageName:                 packageName,
-		PackageSPDXIdentifier:       spdx.ElementID(fmt.Sprintf("Package-%s", packageName)),
+		PackageSPDXIdentifier:       common.ElementID(fmt.Sprintf("Package-%s", packageName)),
 		PackageDownloadLocation:     "NOASSERTION",
 		FilesAnalyzed:               true,
 		IsFilesAnalyzedTagPresent:   true,
diff --git a/builder/builder2v2/build_package_test.go b/builder/builder2v2/build_package_test.go
index 3ab88d2..8a21416 100644
--- a/builder/builder2v2/build_package_test.go
+++ b/builder/builder2v2/build_package_test.go
@@ -5,7 +5,7 @@ package builder2v2
 import (
 	"testing"
 
-	"github.com/spdx/tools-golang/spdx"
+	"github.com/spdx/tools-golang/spdx/common"
 )
 
 // ===== Package section builder tests =====
@@ -13,7 +13,7 @@ func TestBuilder2_2CanBuildPackageSection(t *testing.T) {
 	packageName := "project1"
 	dirRoot := "../../testdata/project1/"
 
-	wantVerificationCode := spdx.PackageVerificationCode{Value: "fc9ac4a370af0a471c2e52af66d6b4cf4e2ba12b"}
+	wantVerificationCode := common.PackageVerificationCode{Value: "fc9ac4a370af0a471c2e52af66d6b4cf4e2ba12b"}
 
 	pkg, err := BuildPackageSection2_2(packageName, dirRoot, nil)
 	if err != nil {
@@ -26,7 +26,7 @@ func TestBuilder2_2CanBuildPackageSection(t *testing.T) {
 	if pkg.PackageName != "project1" {
 		t.Errorf("expected %v, got %v", "project1", pkg.PackageName)
 	}
-	if pkg.PackageSPDXIdentifier != spdx.ElementID("Package-project1") {
+	if pkg.PackageSPDXIdentifier != common.ElementID("Package-project1") {
 		t.Errorf("expected %v, got %v", "Package-project1", pkg.PackageSPDXIdentifier)
 	}
 	if pkg.PackageDownloadLocation != "NOASSERTION" {
@@ -68,20 +68,20 @@ func TestBuilder2_2CanBuildPackageSection(t *testing.T) {
 	if fileEmpty.FileName != "./emptyfile.testdata.txt" {
 		t.Errorf("expected %v, got %v", "./emptyfile.testdata.txt", fileEmpty.FileName)
 	}
-	if fileEmpty.FileSPDXIdentifier != spdx.ElementID("File0") {
+	if fileEmpty.FileSPDXIdentifier != common.ElementID("File0") {
 		t.Errorf("expected %v, got %v", "File0", fileEmpty.FileSPDXIdentifier)
 	}
 	for _, checksum := range fileEmpty.Checksums {
 		switch checksum.Algorithm {
-		case spdx.SHA1:
+		case common.SHA1:
 			if checksum.Value != "da39a3ee5e6b4b0d3255bfef95601890afd80709" {
 				t.Errorf("expected %v, got %v", "da39a3ee5e6b4b0d3255bfef95601890afd80709", checksum.Value)
 			}
-		case spdx.SHA256:
+		case common.SHA256:
 			if checksum.Value != "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" {
 				t.Errorf("expected %v, got %v", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", checksum.Value)
 			}
-		case spdx.MD5:
+		case common.MD5:
 			if checksum.Value != "d41d8cd98f00b204e9800998ecf8427e" {
 				t.Errorf("expected %v, got %v", "d41d8cd98f00b204e9800998ecf8427e", checksum.Value)
 			}
diff --git a/builder/builder2v2/build_relationship.go b/builder/builder2v2/build_relationship.go
index 5eaf9de..1dd8f2b 100644
--- a/builder/builder2v2/build_relationship.go
+++ b/builder/builder2v2/build_relationship.go
@@ -5,17 +5,18 @@ package builder2v2
 import (
 	"fmt"
 
-	"github.com/spdx/tools-golang/spdx"
+	"github.com/spdx/tools-golang/spdx/common"
+	"github.com/spdx/tools-golang/spdx/v2_2"
 )
 
 // BuildRelationshipSection2_2 creates an SPDX Relationship (version 2.2)
 // solely for the document "DESCRIBES" package relationship, returning that
 // relationship or error if any is encountered. Arguments:
 //   - packageName: name of package / directory
-func BuildRelationshipSection2_2(packageName string) (*spdx.Relationship2_2, error) {
-	rln := &spdx.Relationship2_2{
-		RefA:         spdx.MakeDocElementID("", "DOCUMENT"),
-		RefB:         spdx.MakeDocElementID("", fmt.Sprintf("Package-%s", packageName)),
+func BuildRelationshipSection2_2(packageName string) (*v2_2.Relationship, error) {
+	rln := &v2_2.Relationship{
+		RefA:         common.MakeDocElementID("", "DOCUMENT"),
+		RefB:         common.MakeDocElementID("", fmt.Sprintf("Package-%s", packageName)),
 		Relationship: "DESCRIBES",
 	}
 
diff --git a/builder/builder2v2/build_relationship_test.go b/builder/builder2v2/build_relationship_test.go
index 4e8ba99..126ddbe 100644
--- a/builder/builder2v2/build_relationship_test.go
+++ b/builder/builder2v2/build_relationship_test.go
@@ -5,7 +5,7 @@ package builder2v2
 import (
 	"testing"
 
-	"github.com/spdx/tools-golang/spdx"
+	"github.com/spdx/tools-golang/spdx/common"
 )
 
 // ===== Relationship section builder tests =====
@@ -20,10 +20,10 @@ func TestBuilder2_2CanBuildRelationshipSection(t *testing.T) {
 	if rln == nil {
 		t.Fatalf("expected non-nil relationship, got nil")
 	}
-	if rln.RefA != spdx.MakeDocElementID("", "DOCUMENT") {
+	if rln.RefA != common.MakeDocElementID("", "DOCUMENT") {
 		t.Errorf("expected %v, got %v", "DOCUMENT", rln.RefA)
 	}
-	if rln.RefB != spdx.MakeDocElementID("", "Package-project17") {
+	if rln.RefB != common.MakeDocElementID("", "Package-project17") {
 		t.Errorf("expected %v, got %v", "Package-project17", rln.RefB)
 	}
 	if rln.Relationship != "DESCRIBES" {