From 08f143beb6f9aa0c39b75e78d031158c829612b9 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Tue, 27 Jun 2023 14:13:43 -0700 Subject: [PATCH] Don't call getValue when getting namespace Fixes #177 Signed-off-by: Gary O'Neall --- src/main/java/org/spdx/library/model/ExternalDocumentRef.java | 2 +- src/main/java/org/spdx/library/model/ExternalSpdxElement.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/spdx/library/model/ExternalDocumentRef.java b/src/main/java/org/spdx/library/model/ExternalDocumentRef.java index 49adef13..a29f56cc 100644 --- a/src/main/java/org/spdx/library/model/ExternalDocumentRef.java +++ b/src/main/java/org/spdx/library/model/ExternalDocumentRef.java @@ -183,7 +183,7 @@ public ExternalDocumentRef setChecksum(Checksum checksum) throws InvalidSPDXAnal * @return the spdxDocumentNamespace or empty string if no namespace */ public String getSpdxDocumentNamespace() throws InvalidSPDXAnalysisException { - Optional docNamespace = getObjectPropertyValue(SpdxConstants.PROP_EXTERNAL_SPDX_DOCUMENT); + Optional docNamespace = getModelStore().getValue(getDocumentUri(), getId(), SpdxConstants.PROP_EXTERNAL_SPDX_DOCUMENT); if (!docNamespace.isPresent()) { logger.warn("SPDX document namespace not found"); return ""; diff --git a/src/main/java/org/spdx/library/model/ExternalSpdxElement.java b/src/main/java/org/spdx/library/model/ExternalSpdxElement.java index 0439c4ab..4a210db6 100644 --- a/src/main/java/org/spdx/library/model/ExternalSpdxElement.java +++ b/src/main/java/org/spdx/library/model/ExternalSpdxElement.java @@ -196,8 +196,8 @@ public static ExternalSpdxElement uriToExternalSpdxElement(String uri, public static String externalDocumentIdToNamespace(String externalDocumentId, IModelStore stModelStore, String stDocumentUri, ModelCopyManager copyManager) throws InvalidSPDXAnalysisException { - Optional retval = getObjectPropertyValue(stModelStore, stDocumentUri, - externalDocumentId, SpdxConstants.PROP_EXTERNAL_SPDX_DOCUMENT, copyManager); + + Optional retval = stModelStore.getValue(stDocumentUri, externalDocumentId, SpdxConstants.PROP_EXTERNAL_SPDX_DOCUMENT); if (!retval.isPresent()) { throw new InvalidSPDXAnalysisException("No external document reference exists for document ID "+externalDocumentId); }