From 37228d58f091496f9721d3e90f7047d72ff9dfc7 Mon Sep 17 00:00:00 2001 From: specter25 Date: Sun, 21 Mar 2021 12:19:42 +0530 Subject: 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 --- tvloader/parser2v2/parse_file.go | 9 +++------ tvloader/parser2v2/parse_file_test.go | 1 - tvloader/parser2v2/parse_package.go | 10 +++------- tvloader/parser2v2/parse_package_test.go | 1 - 4 files changed, 6 insertions(+), 15 deletions(-) (limited to 'tvloader/parser2v2') 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) } - } } -- cgit v1.2.3