Combine switch cases and remove redundant NL

- Combine the switch cases when  defined enum for case type
- Rmoved redundant NL in the code

Signed-off-by: specter25 <ujjwalcoding012@gmail.com>

17 files changed, 12 insertions, 71 deletions

diff --git a/builder/build_test.go b/builder/build_test.go
index 0c30679..8c18c44 100644
--- a/builder/build_test.go
+++ b/builder/build_test.go
@@ -498,7 +498,6 @@ func TestBuild2_2CreatesDocument(t *testing.T) {
 			}
 		}
 	}
-
 	if fileEmpty.LicenseConcluded != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.LicenseConcluded)
 	}
@@ -536,7 +535,6 @@ func TestBuild2_2CreatesDocument(t *testing.T) {
 			}
 		}
 	}
-
 	if file1.LicenseConcluded != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", file1.LicenseConcluded)
 	}
@@ -574,7 +572,6 @@ func TestBuild2_2CreatesDocument(t *testing.T) {
 			}
 		}
 	}
-
 	if file3.LicenseConcluded != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", file3.LicenseConcluded)
 	}
@@ -612,7 +609,6 @@ func TestBuild2_2CreatesDocument(t *testing.T) {
 			}
 		}
 	}
-
 	if file4.LicenseConcluded != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", file4.LicenseConcluded)
 	}
diff --git a/builder/builder2v2/build_file.go b/builder/builder2v2/build_file.go
index 7a267ad..684a763 100644
--- a/builder/builder2v2/build_file.go
+++ b/builder/builder2v2/build_file.go
@@ -46,7 +46,6 @@ func BuildFileSection2_2(filePath string, prefix string, fileNumber int) (*spdx.
 				Value:     smd5,
 			},
 		},
-
 		LicenseConcluded:  "NOASSERTION",
 		LicenseInfoInFile: []string{},
 		FileCopyrightText: "NOASSERTION",
diff --git a/builder/builder2v2/build_package_test.go b/builder/builder2v2/build_package_test.go
index 044721f..143e8db 100644
--- a/builder/builder2v2/build_package_test.go
+++ b/builder/builder2v2/build_package_test.go
@@ -87,7 +87,6 @@ func TestBuilder2_2CanBuildPackageSection(t *testing.T) {
 			}
 		}
 	}
-
 	if fileEmpty.LicenseConcluded != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.LicenseConcluded)
 	}
diff --git a/licensediff/licensediff_test.go b/licensediff/licensediff_test.go
index ec8b728..bd53f31 100644
--- a/licensediff/licensediff_test.go
+++ b/licensediff/licensediff_test.go
@@ -507,7 +507,6 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
 		},
-
 		LicenseConcluded: "Apache-2.0",
 		LicenseInfoInFile: []string{
 			"LicenseRef-We-will-ignore-LicenseInfoInFile",
@@ -525,7 +524,6 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
 		},
-
 		LicenseConcluded: "GPL-2.0-or-later",
 		LicenseInfoInFile: []string{
 			"NOASSERTION",
@@ -543,7 +541,6 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
 		},
-
 		LicenseConcluded: "MPL-2.0",
 		LicenseInfoInFile: []string{
 			"NOASSERTION",
@@ -562,7 +559,6 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
 		},
-
 		LicenseConcluded: "MIT",
 		LicenseInfoInFile: []string{
 			"NOASSERTION",
@@ -578,7 +574,6 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
 		},
-
 		LicenseConcluded: "Apache-2.0 AND MIT",
 		LicenseInfoInFile: []string{
 			"NOASSERTION",
@@ -597,7 +592,6 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
 		},
-
 		LicenseConcluded: "BSD-3-Clause",
 		LicenseInfoInFile: []string{
 			"NOASSERTION",
@@ -613,7 +607,6 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
 		},
-
 		LicenseConcluded: "BSD-3-Clause",
 		LicenseInfoInFile: []string{
 			"NOASSERTION",
@@ -632,7 +625,6 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
 		},
-
 		LicenseConcluded: "CC0-1.0",
 		LicenseInfoInFile: []string{
 			"NOASSERTION",
@@ -648,7 +640,6 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) {
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
 		},
-
 		LicenseConcluded: "Unlicense",
 		LicenseInfoInFile: []string{
 			"NOASSERTION",
@@ -800,7 +791,6 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
 		},
-
 		LicenseConcluded: "Apache-2.0",
 		LicenseInfoInFile: []string{
 			"LicenseRef-We-will-ignore-LicenseInfoInFile",
@@ -818,7 +808,6 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
 		},
-
 		LicenseConcluded: "GPL-2.0-or-later",
 		LicenseInfoInFile: []string{
 			"NOASSERTION",
@@ -836,7 +825,6 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
 		},
-
 		LicenseConcluded: "MPL-2.0",
 		LicenseInfoInFile: []string{
 			"NOASSERTION",
@@ -855,7 +843,6 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
 		},
-
 		LicenseConcluded: "MIT",
 		LicenseInfoInFile: []string{
 			"NOASSERTION",
@@ -871,7 +858,6 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
 		},
-
 		LicenseConcluded: "Apache-2.0 AND MIT",
 		LicenseInfoInFile: []string{
 			"NOASSERTION",
@@ -918,7 +904,6 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
 		},
-
 		LicenseConcluded: "CC0-1.0",
 		LicenseInfoInFile: []string{
 			"NOASSERTION",
@@ -934,7 +919,6 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) {
 				Value:     "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3",
 			},
 		},
-
 		LicenseConcluded: "Unlicense",
 		LicenseInfoInFile: []string{
 			"NOASSERTION",
diff --git a/rdfloader/parser2v2/parse_file.go b/rdfloader/parser2v2/parse_file.go
index 2264eb8..b3b0e49 100644
--- a/rdfloader/parser2v2/parse_file.go
+++ b/rdfloader/parser2v2/parse_file.go
@@ -134,12 +134,9 @@ func (parser *rdfParser2_2) setFileChecksumFromNode(file *spdx.File2_2, checksum
 		file.FileChecksums = map[spdx.ChecksumAlgorithm]spdx.Checksum{}
 	}
 	switch checksumAlgorithm {
-	case spdx.MD5:
-		file.FileChecksums[spdx.MD5] = spdx.Checksum{Algorithm: spdx.MD5, Value: checksumValue}
-	case spdx.SHA1:
-		file.FileChecksums[spdx.SHA1] = spdx.Checksum{Algorithm: spdx.SHA1, Value: checksumValue}
-	case spdx.SHA256:
-		file.FileChecksums[spdx.SHA256] = spdx.Checksum{Algorithm: spdx.SHA256, Value: checksumValue}
+	case spdx.MD5, spdx.SHA1, spdx.SHA256:
+		algorithm := spdx.ChecksumAlgorithm(checksumAlgorithm)
+		file.FileChecksums[algorithm] = spdx.Checksum{Algorithm: algorithm, Value: checksumValue}
 	case "":
 		return fmt.Errorf("empty checksum algorithm and value")
 	default:
diff --git a/rdfloader/parser2v2/parse_package.go b/rdfloader/parser2v2/parse_package.go
index 19e2ee6..47a2af8 100644
--- a/rdfloader/parser2v2/parse_package.go
+++ b/rdfloader/parser2v2/parse_package.go
@@ -305,12 +305,9 @@ func (parser *rdfParser2_2) setPackageChecksum(pkg *spdx.Package2_2, node *gordf
 		pkg.PackageChecksums = make(map[spdx.ChecksumAlgorithm]spdx.Checksum)
 	}
 	switch checksumAlgorithm {
-	case spdx.MD5:
-		pkg.PackageChecksums[spdx.MD5] = spdx.Checksum{Algorithm: spdx.MD5, Value: checksumValue}
-	case spdx.SHA1:
-		pkg.PackageChecksums[spdx.SHA1] = spdx.Checksum{Algorithm: spdx.SHA1, Value: checksumValue}
-	case spdx.SHA256:
-		pkg.PackageChecksums[spdx.SHA256] = spdx.Checksum{Algorithm: spdx.SHA256, Value: checksumValue}
+	case spdx.MD5, spdx.SHA1, spdx.SHA256:
+		algorithm := spdx.ChecksumAlgorithm(checksumAlgorithm)
+		pkg.PackageChecksums[algorithm] = spdx.Checksum{Algorithm: algorithm, Value: checksumValue}
 	default:
 		return fmt.Errorf("unknown checksumAlgorithm %s while parsing a package", checksumAlgorithm)
 	}
diff --git a/spdx/file.go b/spdx/file.go
index 1ec3202..a745dc3 100644
--- a/spdx/file.go
+++ b/spdx/file.go
@@ -105,7 +105,6 @@ type File2_2 struct {
 
 	// 4.4: File Checksum: may have keys for SHA1, SHA256 and/or MD5
 	// Cardinality: mandatory, one SHA1, others may be optionally provided
-
 	FileChecksums map[ChecksumAlgorithm]Checksum
 
 	// 4.5: Concluded License: SPDX License Expression, "NONE" or "NOASSERTION"
diff --git a/spdx/package.go b/spdx/package.go
index 953c9db..9aeb8a2 100644
--- a/spdx/package.go
+++ b/spdx/package.go
@@ -192,7 +192,6 @@ type Package2_2 struct {
 
 	// 3.10: Package Checksum: may have keys for SHA1, SHA256 and/or MD5
 	// Cardinality: optional, one or many
-
 	PackageChecksums map[ChecksumAlgorithm]Checksum
 
 	// 3.11: Package Home Page
diff --git a/tvloader/parser2v2/parse_file.go b/tvloader/parser2v2/parse_file.go
index 8151a6e..86886d3 100644
--- a/tvloader/parser2v2/parse_file.go
+++ b/tvloader/parser2v2/parse_file.go
@@ -62,12 +62,9 @@ func (parser *tvParser2_2) parsePairFromFile2_2(tag string, value string) error
 			parser.file.FileChecksums = map[spdx.ChecksumAlgorithm]spdx.Checksum{}
 		}
 		switch subkey {
-		case spdx.SHA1:
-			parser.file.FileChecksums[spdx.SHA1] = spdx.Checksum{Algorithm: spdx.SHA1, Value: subvalue}
-		case spdx.SHA256:
-			parser.file.FileChecksums[spdx.SHA256] = spdx.Checksum{Algorithm: spdx.SHA256, Value: subvalue}
-		case spdx.MD5:
-			parser.file.FileChecksums[spdx.MD5] = spdx.Checksum{Algorithm: spdx.MD5, Value: subvalue}
+		case spdx.SHA1, spdx.SHA256, spdx.MD5:
+			algorithm := spdx.ChecksumAlgorithm(subkey)
+			parser.file.FileChecksums[algorithm] = spdx.Checksum{Algorithm: algorithm, Value: subvalue}
 		default:
 			return fmt.Errorf("got unknown checksum type %s", subkey)
 		}
diff --git a/tvloader/parser2v2/parse_file_test.go b/tvloader/parser2v2/parse_file_test.go
index 87283dc..411593f 100644
--- a/tvloader/parser2v2/parse_file_test.go
+++ b/tvloader/parser2v2/parse_file_test.go
@@ -457,7 +457,6 @@ func TestParser2_2CanParseFileTags(t *testing.T) {
 			if checksum.Value != codeMd5 {
 				t.Errorf("expected %s for FileChecksumSHA1, got %s", codeMd5, checksum.Value)
 			}
-
 		}
 	}
 	// Concluded License
diff --git a/tvloader/parser2v2/parse_package.go b/tvloader/parser2v2/parse_package.go
index e7d86dc..3f5939b 100644
--- a/tvloader/parser2v2/parse_package.go
+++ b/tvloader/parser2v2/parse_package.go
@@ -104,16 +104,12 @@ func (parser *tvParser2_2) parsePairFromPackage2_2(tag string, value string) err
 			parser.pkg.PackageChecksums = make(map[spdx.ChecksumAlgorithm]spdx.Checksum, 9)
 		}
 		switch subkey {
-		case spdx.SHA1:
-			parser.pkg.PackageChecksums[spdx.SHA1] = spdx.Checksum{Algorithm: spdx.SHA1, Value: subvalue}
-		case spdx.SHA256:
-			parser.pkg.PackageChecksums[spdx.SHA256] = spdx.Checksum{Algorithm: spdx.SHA256, Value: subvalue}
-		case spdx.MD5:
-			parser.pkg.PackageChecksums[spdx.MD5] = spdx.Checksum{Algorithm: spdx.MD5, Value: subvalue}
+		case spdx.SHA1, spdx.SHA256, spdx.MD5:
+			algorithm := spdx.ChecksumAlgorithm(subkey)
+			parser.pkg.PackageChecksums[algorithm] = spdx.Checksum{Algorithm: algorithm, Value: subvalue}
 		default:
 			return fmt.Errorf("got unknown checksum type %s", subkey)
 		}
-
 	case "PackageHomePage":
 		parser.pkg.PackageHomePage = value
 	case "PackageSourceInfo":
diff --git a/tvloader/parser2v2/parse_package_test.go b/tvloader/parser2v2/parse_package_test.go
index 38e7aba..33b4784 100644
--- a/tvloader/parser2v2/parse_package_test.go
+++ b/tvloader/parser2v2/parse_package_test.go
@@ -367,7 +367,6 @@ func TestParser2_2CanParsePackageTags(t *testing.T) {
 			if checksum.Value != codeMd5 {
 				t.Errorf("expected %s for FileChecksumSHA1, got %s", codeMd5, checksum.Value)
 			}
-
 		}
 	}
 
diff --git a/tvsaver/saver2v2/save_document_test.go b/tvsaver/saver2v2/save_document_test.go
index e6674a1..8745db4 100644
--- a/tvsaver/saver2v2/save_document_test.go
+++ b/tvsaver/saver2v2/save_document_test.go
@@ -87,7 +87,6 @@ func TestSaver2_2DocumentSavesText(t *testing.T) {
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983e",
 			},
 		},
-
 		LicenseConcluded: "GPL-2.0-or-later AND WTFPL",
 		LicenseInfoInFile: []string{
 			"Apache-2.0",
@@ -110,7 +109,6 @@ func TestSaver2_2DocumentSavesText(t *testing.T) {
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983f",
 			},
 		},
-
 		LicenseConcluded:  "BSD-3-Clause",
 		LicenseInfoInFile: []string{"BSD-3-Clause"},
 		FileCopyrightText: "Copyright (c) Jane Doe LLC",
diff --git a/tvsaver/saver2v2/save_file.go b/tvsaver/saver2v2/save_file.go
index e8c1d4d..18e95b0 100644
--- a/tvsaver/saver2v2/save_file.go
+++ b/tvsaver/saver2v2/save_file.go
@@ -20,20 +20,15 @@ func renderFile2_2(f *spdx.File2_2, w io.Writer) error {
 	for _, s := range f.FileType {
 		fmt.Fprintf(w, "FileType: %s\n", s)
 	}
-
 	if f.FileChecksums[spdx.SHA1].Value != "" {
 		fmt.Fprintf(w, "FileChecksum: SHA1: %s\n", f.FileChecksums[spdx.SHA1].Value)
-
 	}
 	if f.FileChecksums[spdx.SHA256].Value != "" {
 		fmt.Fprintf(w, "FileChecksum: SHA256: %s\n", f.FileChecksums[spdx.SHA256].Value)
-
 	}
 	if f.FileChecksums[spdx.MD5].Value != "" {
 		fmt.Fprintf(w, "FileChecksum: MD5: %s\n", f.FileChecksums[spdx.MD5].Value)
-
 	}
-
 	if f.LicenseConcluded != "" {
 		fmt.Fprintf(w, "LicenseConcluded: %s\n", f.LicenseConcluded)
 	}
diff --git a/tvsaver/saver2v2/save_file_test.go b/tvsaver/saver2v2/save_file_test.go
index 070efc6..159074d 100644
--- a/tvsaver/saver2v2/save_file_test.go
+++ b/tvsaver/saver2v2/save_file_test.go
@@ -32,7 +32,6 @@ func TestSaver2_2FileSavesText(t *testing.T) {
 				Value:     "624c1abb3664f4b35547e7c73864ad24",
 			},
 		},
-
 		LicenseConcluded: "Apache-2.0",
 		LicenseInfoInFile: []string{
 			"Apache-2.0",
@@ -151,7 +150,6 @@ func TestSaver2_2FileSavesSnippetsAlso(t *testing.T) {
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983c",
 			},
 		},
-
 		LicenseConcluded: "Apache-2.0",
 		LicenseInfoInFile: []string{
 			"Apache-2.0",
@@ -206,7 +204,6 @@ func TestSaver2_2FileOmitsOptionalFieldsIfEmpty(t *testing.T) {
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983c",
 			},
 		},
-
 		LicenseConcluded: "Apache-2.0",
 		LicenseInfoInFile: []string{
 			"Apache-2.0",
@@ -248,7 +245,6 @@ func TestSaver2_2FileWrapsCopyrightMultiLine(t *testing.T) {
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983c",
 			},
 		},
-
 		LicenseConcluded: "Apache-2.0",
 		LicenseInfoInFile: []string{
 			"Apache-2.0",
diff --git a/tvsaver/saver2v2/save_package.go b/tvsaver/saver2v2/save_package.go
index 3fb9d7a..518da06 100644
--- a/tvsaver/saver2v2/save_package.go
+++ b/tvsaver/saver2v2/save_package.go
@@ -58,20 +58,15 @@ func renderPackage2_2(pkg *spdx.Package2_2, w io.Writer) error {
 			fmt.Fprintf(w, "PackageVerificationCode: %s (excludes %s)\n", pkg.PackageVerificationCode, pkg.PackageVerificationCodeExcludedFile)
 		}
 	}
-
 	if pkg.PackageChecksums[spdx.SHA1].Value != "" {
 		fmt.Fprintf(w, "PackageChecksum: SHA1: %s\n", pkg.PackageChecksums[spdx.SHA1].Value)
-
 	}
 	if pkg.PackageChecksums[spdx.SHA256].Value != "" {
 		fmt.Fprintf(w, "PackageChecksum: SHA256: %s\n", pkg.PackageChecksums[spdx.SHA256].Value)
-
 	}
 	if pkg.PackageChecksums[spdx.MD5].Value != "" {
 		fmt.Fprintf(w, "PackageChecksum: MD5: %s\n", pkg.PackageChecksums[spdx.MD5].Value)
-
 	}
-
 	if pkg.PackageHomePage != "" {
 		fmt.Fprintf(w, "PackageHomePage: %s\n", pkg.PackageHomePage)
 	}
diff --git a/tvsaver/saver2v2/save_package_test.go b/tvsaver/saver2v2/save_package_test.go
index bfca9e0..8221e73 100644
--- a/tvsaver/saver2v2/save_package_test.go
+++ b/tvsaver/saver2v2/save_package_test.go
@@ -73,7 +73,6 @@ func TestSaver2_2PackageSavesTextCombo1(t *testing.T) {
 				Value:     "624c1abb3664f4b35547e7c73864ad24",
 			},
 		},
-
 		PackageHomePage:         "http://example.com/p1",
 		PackageSourceInfo:       "this is a source comment",
 		PackageLicenseConcluded: "GPL-2.0-or-later",
@@ -269,7 +268,6 @@ func TestSaver2_2PackageSavesTextCombo3(t *testing.T) {
 				Value:     "624c1abb3664f4b35547e7c73864ad24",
 			},
 		},
-
 		PackageHomePage:         "http://example.com/p1",
 		PackageSourceInfo:       "this is a source comment",
 		PackageLicenseConcluded: "GPL-2.0-or-later",
@@ -392,7 +390,6 @@ func TestSaver2_2PackageSavesFilesIfPresent(t *testing.T) {
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983c",
 			},
 		},
-
 		LicenseConcluded:  "Apache-2.0",
 		LicenseInfoInFile: []string{"Apache-2.0"},
 		FileCopyrightText: "Copyright (c) Jane Doe",
@@ -407,7 +404,6 @@ func TestSaver2_2PackageSavesFilesIfPresent(t *testing.T) {
 				Value:     "85ed0817af83a24ad8da68c2b5094de69833983d",
 			},
 		},
-
 		LicenseConcluded:  "MIT",
 		LicenseInfoInFile: []string{"MIT"},
 		FileCopyrightText: "Copyright (c) John Doe",