diff options
| author | Rishabh Bhatnagar <bhatnagarrishabh4@gmail.com> | 2020-11-15 07:47:41 +0530 |
|---|---|---|
| committer | Rishabh Bhatnagar <bhatnagarrishabh4@gmail.com> | 2020-11-15 08:07:27 +0530 |
| commit | 8e8ae45907d3fa3bfb909f22d1d90ffeb4a96ae1 (patch) | |
| tree | 2daf56c8e15a3ceafd544394b999a95a09891401 /rdfloader | |
| parent | cb390d3e7522436062657ac2e583c64e29348f64 (diff) | |
| download | spdx-tools-8e8ae45907d3fa3bfb909f22d1d90ffeb4a96ae1.tar.gz | |
Remove packages Variable From rdfParser2_2
- packages was a redundant variable in rdfParser2_2 struct.
- Intention behind adding packages was to make it similar to rdfParser2_2.files
- With this PR, the packages variable has been removed that will partly resolve https://github.com/spdx/tools-golang/issues/51.
Signed-off-by: Rishabh Bhatnagar <bhatnagarrishabh4@gmail.com>
Diffstat (limited to 'rdfloader')
| -rw-r--r-- | rdfloader/parser2v2/parse_relationship.go | 2 | ||||
| -rw-r--r-- | rdfloader/parser2v2/parser.go | 1 | ||||
| -rw-r--r-- | rdfloader/parser2v2/parser_test.go | 3 | ||||
| -rw-r--r-- | rdfloader/parser2v2/types.go | 1 |
4 files changed, 1 insertions, 6 deletions
diff --git a/rdfloader/parser2v2/parse_relationship.go b/rdfloader/parser2v2/parse_relationship.go index 0009abf..a978500 100644 --- a/rdfloader/parser2v2/parse_relationship.go +++ b/rdfloader/parser2v2/parse_relationship.go @@ -89,7 +89,7 @@ func (parser *rdfParser2_2) parseRelatedElementFromTriple(reln *spdx.Relationshi DocumentRefID: "", ElementRefID: pkg.PackageSPDXIdentifier, } - parser.packages[pkg.PackageSPDXIdentifier] = pkg + parser.doc.Packages[pkg.PackageSPDXIdentifier] = pkg case SPDX_SPDX_ELEMENT: // it shouldn't be associated with any other triple. diff --git a/rdfloader/parser2v2/parser.go b/rdfloader/parser2v2/parser.go index 4f1adc0..a97c4a4 100644 --- a/rdfloader/parser2v2/parser.go +++ b/rdfloader/parser2v2/parser.go @@ -27,7 +27,6 @@ func NewParser2_2(gordfParserObj *gordfParser.Parser, nodeToTriples map[string][ Reviews: []*spdx.Review2_2{}, }, files: map[spdx.ElementID]*spdx.File2_2{}, - packages: map[spdx.ElementID]*spdx.Package2_2{}, assocWithPackage: map[spdx.ElementID]bool{}, } return &parser diff --git a/rdfloader/parser2v2/parser_test.go b/rdfloader/parser2v2/parser_test.go index 474395d..be740c9 100644 --- a/rdfloader/parser2v2/parser_test.go +++ b/rdfloader/parser2v2/parser_test.go @@ -15,9 +15,6 @@ func TestNewParser2_2(t *testing.T) { if parser.files == nil { t.Errorf("files should've been initialised, got %v", parser.files) } - if parser.packages == nil { - t.Errorf("packages should've been initialised, got %v", parser.packages) - } if parser.assocWithPackage == nil { t.Errorf("assocWithPackage should've been initialised, got %v", parser.assocWithPackage) } diff --git a/rdfloader/parser2v2/types.go b/rdfloader/parser2v2/types.go index d1efe8d..5d17771 100644 --- a/rdfloader/parser2v2/types.go +++ b/rdfloader/parser2v2/types.go @@ -19,7 +19,6 @@ type rdfParser2_2 struct { // map of packages and files. files map[spdx.ElementID]*spdx.File2_2 assocWithPackage map[spdx.ElementID]bool - packages map[spdx.ElementID]*spdx.Package2_2 // mapping of nodeStrings to parsed object to save double computation. cache map[string]interface{} |