From 44d8c558d41b116f350cfee508fa41f175b3ad25 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Mon, 3 Feb 2025 02:17:12 +0100 Subject: [PATCH] Add SPDX header to source files Signed-off-by: Arthit Suriyawongkul --- CONTRIBUTING.md | 6 ++++- README.md | 9 ++++--- .../spdx/spreadsheetstore/AbstractSheet.java | 15 +++++------ .../spreadsheetstore/AnnotationsSheet.java | 15 +++++------ .../spreadsheetstore/DocumentInfoSheet.java | 17 +++++++------ .../DocumentInfoSheetV2d0.java | 15 +++++------ .../spreadsheetstore/ExternalRefsSheet.java | 15 +++++------ .../ExtractedLicenseInfoSheet.java | 15 +++++------ .../ExtractedLicenseInfoSheetV1d1.java | 15 +++++------ .../spreadsheetstore/PackageInfoSheet.java | 15 +++++------ .../PackageInfoSheetV2d0.java | 15 +++++------ .../PackageInfoSheetV2d1.java | 15 +++++------ .../PackageInfoSheetV2d2.java | 15 +++++------ .../PackageInfoSheetV2d3.java | 15 +++++------ .../spdx/spreadsheetstore/PerFileSheet.java | 15 +++++------ .../spreadsheetstore/PerFileSheetV2d0.java | 15 +++++------ .../spreadsheetstore/PerFileSheetV2d2.java | 15 +++++------ .../spreadsheetstore/PerFileSheetV2d3.java | 15 +++++------ .../spreadsheetstore/RelationshipsSheet.java | 16 ++++++------ .../spdx/spreadsheetstore/SnippetSheet.java | 18 ++++++------- .../spreadsheetstore/SpdxSpreadsheet.java | 15 +++++------ .../SpreadsheetException.java | 15 +++++------ .../spreadsheetstore/SpreadsheetStore.java | 15 +++++------ .../spdx/spreadsheetstore/package-info.java | 25 +++++++++++++++++++ .../AnnotationsSheetTest.java | 18 ++++++------- .../DocumentInfoSheetTest.java | 18 ++++++------- .../ExternalRefsSheetTest.java | 18 ++++++------- .../ExtractedLicenseInfoSheetTest.java | 18 +++++++++++++ .../PackageInfoSheetTest.java | 18 ++++++------- .../spreadsheetstore/PerFileSheetTest.java | 18 ++++++------- .../RelationshipSheetTest.java | 18 ++++++------- .../spreadsheetstore/SnippetSheetTest.java | 18 ++++++------- .../SpreadsheetStoreTest.java | 18 ++++++------- 33 files changed, 295 insertions(+), 228 deletions(-) create mode 100644 src/main/java/org/spdx/spreadsheetstore/package-info.java diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e3f4e4c..b77a588 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,15 +1,18 @@ Contributing ============ + Thank you for your interest in `spdx-java-spreadsheet-store`. The project is open-source software, and bug reports, suggestions, and most especially patches are welcome. Issues ------ + `spdx-java-spreadsheet-store` has a [project page on GitHub](https://github.com/spdx/spdx-java-spreadsheet-store) where you can [create an issue](https://github.com/spdx/spdx-java-spreadsheet-store/issues) to report a bug, make a suggestion, or propose a substantial change or improvement that you might like to make. You may also wish to contact the SPDX working group technical team through its mailing list, [spdx-tech@lists.spdx.org](mailto:spdx-tech@lists.spdx.org). If you would like to work on a fix for any issue, please assign the issue to yourself prior to creating a Pull Request. Pull Requests ------- + The source code for `spdx-java-spreadsheet-store` is hosted on [github.com/spdx/spdx-java-spreadsheet-store](https://github.com/spdx/spdx-java-spreadsheet-store). Please review [open pull requests](https://github.com/spdx/spdx-java-spreadsheet-store/pulls) and [active branches](https://github.com/spdx/spdx-java-spreadsheet-store/branches) before committing time to a substantial revision. Work along similar lines may already be in progress. To submit a pull request via GitHub, fork the repository, create a topic branch from `master` for your work, and send a pull request when ready. If you would prefer to send a patch or grant access to pull from your own Git repository, please contact the project's contributors by e-mail. @@ -20,4 +23,5 @@ Once implemented, submit a pull request with `spec/X.X` branch as the parent bra Licensing --------- -However you choose to contribute, please sign-off in each of your commits that you license your contributions under the terms of [the Developer Certificate of Origin](https://developercertificate.org/). Git has utilities for signing off on commits: `git commit -s` signs a current commit, and `git rebase --signoff ` retroactively signs a range of past commits. \ No newline at end of file + +However you choose to contribute, please sign-off in each of your commits that you license your contributions under the terms of [the Developer Certificate of Origin](https://developercertificate.org/). Git has utilities for signing off on commits: `git commit -s` signs a current commit, and `git rebase --signoff ` retroactively signs a range of past commits. diff --git a/README.md b/README.md index 4f2415f..a2271c4 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,12 @@ # spdx-java-spreadsheet-store + Stores SPDX documents in Microsoft Excel formats. Supports both XLS and XLSX file types. This store supports serializing and deserializing files in XLS and XLSX spreadsheet formats. This library utilizes the [SPDX Java Library Storage Interface](https://github.com/spdx/Spdx-Java-Library#storage-interface) extending the `ExtendedSpdxStore` which allows for utilizing any underlying store which implements the [SPDX Java Library Storage Interface](https://github.com/spdx/Spdx-Java-Library#storage-interface). -# Using the Library +## Using the Library This library is intended to be used in conjunction with the [SPDX Java Library](https://github.com/spdx/Spdx-Java-Library). @@ -16,10 +17,10 @@ Create an instance of `SpreadsheetStore(IModelStore baseStore, SpreadsheetFormat - `XLS` - Microsoft Excel 97 to 2003 Workbook format - `XLSX` - Microsoft Excel workbook format -# Serializing and Deserializing +## Serializing and Deserializing This library supports the `ISerializableModelStore` interface for serializing and deserializing files based on the format specified. -# Development Status +## Development Status -Mostly stable - although it has not been widely used. \ No newline at end of file +Mostly stable - although it has not been widely used. diff --git a/src/main/java/org/spdx/spreadsheetstore/AbstractSheet.java b/src/main/java/org/spdx/spreadsheetstore/AbstractSheet.java index 8638eea..bfdeb9f 100644 --- a/src/main/java/org/spdx/spreadsheetstore/AbstractSheet.java +++ b/src/main/java/org/spdx/spreadsheetstore/AbstractSheet.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/spdx/spreadsheetstore/AnnotationsSheet.java b/src/main/java/org/spdx/spreadsheetstore/AnnotationsSheet.java index 4a278ac..6865a49 100644 --- a/src/main/java/org/spdx/spreadsheetstore/AnnotationsSheet.java +++ b/src/main/java/org/spdx/spreadsheetstore/AnnotationsSheet.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/spdx/spreadsheetstore/DocumentInfoSheet.java b/src/main/java/org/spdx/spreadsheetstore/DocumentInfoSheet.java index c6f3f26..63a8f03 100644 --- a/src/main/java/org/spdx/spreadsheetstore/DocumentInfoSheet.java +++ b/src/main/java/org/spdx/spreadsheetstore/DocumentInfoSheet.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -33,9 +34,9 @@ /** * Abstract class for sheet containing information about the origins of an SPDX document + * * Specific versions implemented as subclasses * @author Gary O'Neall - * */ public abstract class DocumentInfoSheet extends AbstractSheet { static final int SPREADSHEET_VERSION_COL = 0; diff --git a/src/main/java/org/spdx/spreadsheetstore/DocumentInfoSheetV2d0.java b/src/main/java/org/spdx/spreadsheetstore/DocumentInfoSheetV2d0.java index adf6e89..c28cee8 100644 --- a/src/main/java/org/spdx/spreadsheetstore/DocumentInfoSheetV2d0.java +++ b/src/main/java/org/spdx/spreadsheetstore/DocumentInfoSheetV2d0.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/spdx/spreadsheetstore/ExternalRefsSheet.java b/src/main/java/org/spdx/spreadsheetstore/ExternalRefsSheet.java index 46a69ae..5060176 100644 --- a/src/main/java/org/spdx/spreadsheetstore/ExternalRefsSheet.java +++ b/src/main/java/org/spdx/spreadsheetstore/ExternalRefsSheet.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/spdx/spreadsheetstore/ExtractedLicenseInfoSheet.java b/src/main/java/org/spdx/spreadsheetstore/ExtractedLicenseInfoSheet.java index 5d7f5a9..33bb509 100644 --- a/src/main/java/org/spdx/spreadsheetstore/ExtractedLicenseInfoSheet.java +++ b/src/main/java/org/spdx/spreadsheetstore/ExtractedLicenseInfoSheet.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/spdx/spreadsheetstore/ExtractedLicenseInfoSheetV1d1.java b/src/main/java/org/spdx/spreadsheetstore/ExtractedLicenseInfoSheetV1d1.java index 94c600c..83f36fa 100644 --- a/src/main/java/org/spdx/spreadsheetstore/ExtractedLicenseInfoSheetV1d1.java +++ b/src/main/java/org/spdx/spreadsheetstore/ExtractedLicenseInfoSheetV1d1.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheet.java b/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheet.java index f87423b..2c0b2ec 100644 --- a/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheet.java +++ b/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheet.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheetV2d0.java b/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheetV2d0.java index 7cb355a..62e2d95 100644 --- a/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheetV2d0.java +++ b/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheetV2d0.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheetV2d1.java b/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheetV2d1.java index 3578d40..eab7c16 100644 --- a/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheetV2d1.java +++ b/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheetV2d1.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheetV2d2.java b/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheetV2d2.java index 32e62fd..e619ab9 100644 --- a/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheetV2d2.java +++ b/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheetV2d2.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheetV2d3.java b/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheetV2d3.java index ef476c6..1d04ecd 100644 --- a/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheetV2d3.java +++ b/src/main/java/org/spdx/spreadsheetstore/PackageInfoSheetV2d3.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/spdx/spreadsheetstore/PerFileSheet.java b/src/main/java/org/spdx/spreadsheetstore/PerFileSheet.java index 6c1c091..fbd1538 100644 --- a/src/main/java/org/spdx/spreadsheetstore/PerFileSheet.java +++ b/src/main/java/org/spdx/spreadsheetstore/PerFileSheet.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/spdx/spreadsheetstore/PerFileSheetV2d0.java b/src/main/java/org/spdx/spreadsheetstore/PerFileSheetV2d0.java index fe3d991..2e4776e 100644 --- a/src/main/java/org/spdx/spreadsheetstore/PerFileSheetV2d0.java +++ b/src/main/java/org/spdx/spreadsheetstore/PerFileSheetV2d0.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/spdx/spreadsheetstore/PerFileSheetV2d2.java b/src/main/java/org/spdx/spreadsheetstore/PerFileSheetV2d2.java index b5118bd..5e0c260 100644 --- a/src/main/java/org/spdx/spreadsheetstore/PerFileSheetV2d2.java +++ b/src/main/java/org/spdx/spreadsheetstore/PerFileSheetV2d2.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/spdx/spreadsheetstore/PerFileSheetV2d3.java b/src/main/java/org/spdx/spreadsheetstore/PerFileSheetV2d3.java index db69a73..0af2037 100644 --- a/src/main/java/org/spdx/spreadsheetstore/PerFileSheetV2d3.java +++ b/src/main/java/org/spdx/spreadsheetstore/PerFileSheetV2d3.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/spdx/spreadsheetstore/RelationshipsSheet.java b/src/main/java/org/spdx/spreadsheetstore/RelationshipsSheet.java index 5373af4..e457f56 100644 --- a/src/main/java/org/spdx/spreadsheetstore/RelationshipsSheet.java +++ b/src/main/java/org/spdx/spreadsheetstore/RelationshipsSheet.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -39,7 +40,6 @@ /** * Sheet containing relationship data * @author Gary O'Neall - * */ public class RelationshipsSheet extends AbstractSheet { diff --git a/src/main/java/org/spdx/spreadsheetstore/SnippetSheet.java b/src/main/java/org/spdx/spreadsheetstore/SnippetSheet.java index d27f06a..f04e8f3 100644 --- a/src/main/java/org/spdx/spreadsheetstore/SnippetSheet.java +++ b/src/main/java/org/spdx/spreadsheetstore/SnippetSheet.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -56,8 +57,7 @@ import org.spdx.storage.IModelStore.IdType; /** - * @author gary - * + * @author Gary O'Neall */ public class SnippetSheet extends AbstractSheet { static final Logger logger = LoggerFactory.getLogger(SnippetSheet.class); diff --git a/src/main/java/org/spdx/spreadsheetstore/SpdxSpreadsheet.java b/src/main/java/org/spdx/spreadsheetstore/SpdxSpreadsheet.java index 90d2daa..5c113d0 100644 --- a/src/main/java/org/spdx/spreadsheetstore/SpdxSpreadsheet.java +++ b/src/main/java/org/spdx/spreadsheetstore/SpdxSpreadsheet.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/spdx/spreadsheetstore/SpreadsheetException.java b/src/main/java/org/spdx/spreadsheetstore/SpreadsheetException.java index e7b366b..1a36c9c 100644 --- a/src/main/java/org/spdx/spreadsheetstore/SpreadsheetException.java +++ b/src/main/java/org/spdx/spreadsheetstore/SpreadsheetException.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/spdx/spreadsheetstore/SpreadsheetStore.java b/src/main/java/org/spdx/spreadsheetstore/SpreadsheetStore.java index 7da272d..5955019 100644 --- a/src/main/java/org/spdx/spreadsheetstore/SpreadsheetStore.java +++ b/src/main/java/org/spdx/spreadsheetstore/SpreadsheetStore.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/spdx/spreadsheetstore/package-info.java b/src/main/java/org/spdx/spreadsheetstore/package-info.java new file mode 100644 index 0000000..b31ed5c --- /dev/null +++ b/src/main/java/org/spdx/spreadsheetstore/package-info.java @@ -0,0 +1,25 @@ +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2025 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Package to support the SPDX spreadsheet store + * + * @author Gary O'Neall + */ +package org.spdx.spreadsheetstore; diff --git a/src/test/java/org/spdx/spreadsheetstore/AnnotationsSheetTest.java b/src/test/java/org/spdx/spreadsheetstore/AnnotationsSheetTest.java index 663333b..2b8c926 100644 --- a/src/test/java/org/spdx/spreadsheetstore/AnnotationsSheetTest.java +++ b/src/test/java/org/spdx/spreadsheetstore/AnnotationsSheetTest.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -34,8 +35,7 @@ import junit.framework.TestCase; /** - * @author gary - * + * @author Gary O'Neall */ public class AnnotationsSheetTest extends TestCase { diff --git a/src/test/java/org/spdx/spreadsheetstore/DocumentInfoSheetTest.java b/src/test/java/org/spdx/spreadsheetstore/DocumentInfoSheetTest.java index 5f833fa..19bbaab 100644 --- a/src/test/java/org/spdx/spreadsheetstore/DocumentInfoSheetTest.java +++ b/src/test/java/org/spdx/spreadsheetstore/DocumentInfoSheetTest.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -43,8 +44,7 @@ import junit.framework.TestCase; /** - * @author gary - * + * @author Gary O'Neall */ public class DocumentInfoSheetTest extends TestCase { diff --git a/src/test/java/org/spdx/spreadsheetstore/ExternalRefsSheetTest.java b/src/test/java/org/spdx/spreadsheetstore/ExternalRefsSheetTest.java index 49a3228..87148f7 100644 --- a/src/test/java/org/spdx/spreadsheetstore/ExternalRefsSheetTest.java +++ b/src/test/java/org/spdx/spreadsheetstore/ExternalRefsSheetTest.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -39,8 +40,7 @@ import junit.framework.TestCase; /** - * @author gary - * + * @author Gary O'Neall */ public class ExternalRefsSheetTest extends TestCase { diff --git a/src/test/java/org/spdx/spreadsheetstore/ExtractedLicenseInfoSheetTest.java b/src/test/java/org/spdx/spreadsheetstore/ExtractedLicenseInfoSheetTest.java index b396ec8..a441aa8 100644 --- a/src/test/java/org/spdx/spreadsheetstore/ExtractedLicenseInfoSheetTest.java +++ b/src/test/java/org/spdx/spreadsheetstore/ExtractedLicenseInfoSheetTest.java @@ -1,3 +1,21 @@ +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.spdx.spreadsheetstore; import java.util.ArrayList; diff --git a/src/test/java/org/spdx/spreadsheetstore/PackageInfoSheetTest.java b/src/test/java/org/spdx/spreadsheetstore/PackageInfoSheetTest.java index 068befe..6b0c80e 100644 --- a/src/test/java/org/spdx/spreadsheetstore/PackageInfoSheetTest.java +++ b/src/test/java/org/spdx/spreadsheetstore/PackageInfoSheetTest.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -52,8 +53,7 @@ import junit.framework.TestCase; /** - * @author gary - * + * @author Gary O'Neall */ public class PackageInfoSheetTest extends TestCase { diff --git a/src/test/java/org/spdx/spreadsheetstore/PerFileSheetTest.java b/src/test/java/org/spdx/spreadsheetstore/PerFileSheetTest.java index 367e77a..1c46df9 100644 --- a/src/test/java/org/spdx/spreadsheetstore/PerFileSheetTest.java +++ b/src/test/java/org/spdx/spreadsheetstore/PerFileSheetTest.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -51,8 +52,7 @@ import junit.framework.TestCase; /** - * @author gary - * + * @author Gary O'Neall */ public class PerFileSheetTest extends TestCase { diff --git a/src/test/java/org/spdx/spreadsheetstore/RelationshipSheetTest.java b/src/test/java/org/spdx/spreadsheetstore/RelationshipSheetTest.java index 41c0712..70b2be5 100644 --- a/src/test/java/org/spdx/spreadsheetstore/RelationshipSheetTest.java +++ b/src/test/java/org/spdx/spreadsheetstore/RelationshipSheetTest.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -35,8 +36,7 @@ import junit.framework.TestCase; /** - * @author gary - * + * @author Gary O'Neall */ public class RelationshipSheetTest extends TestCase { diff --git a/src/test/java/org/spdx/spreadsheetstore/SnippetSheetTest.java b/src/test/java/org/spdx/spreadsheetstore/SnippetSheetTest.java index c147e30..ff96fe1 100644 --- a/src/test/java/org/spdx/spreadsheetstore/SnippetSheetTest.java +++ b/src/test/java/org/spdx/spreadsheetstore/SnippetSheetTest.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -47,8 +48,7 @@ import junit.framework.TestCase; /** - * @author gary - * + * @author Gary O'Neall */ public class SnippetSheetTest extends TestCase { diff --git a/src/test/java/org/spdx/spreadsheetstore/SpreadsheetStoreTest.java b/src/test/java/org/spdx/spreadsheetstore/SpreadsheetStoreTest.java index 5fd8e5f..45fcae3 100644 --- a/src/test/java/org/spdx/spreadsheetstore/SpreadsheetStoreTest.java +++ b/src/test/java/org/spdx/spreadsheetstore/SpreadsheetStoreTest.java @@ -1,14 +1,15 @@ -/** - * Copyright (c) 2020 Source Auditor Inc. - * +/* + * SPDX-FileContributor: Gary O'Neall + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -74,8 +75,7 @@ import junit.framework.TestCase; /** - * @author gary - * + * @author Gary O'Neall */ public class SpreadsheetStoreTest extends TestCase {