diff --git a/pom.xml b/pom.xml index 8cf75f66..6d5d2ab0 100644 --- a/pom.xml +++ b/pom.xml @@ -153,12 +153,12 @@ org.spdx spdx-java-core - 1.0.0-RC1 + 1.0.0-RC2 org.spdx spdx-java-model-3_0 - 1.0.0-RC1 + 1.0.0-RC2 diff --git a/src/main/java/org/spdx/library/conversion/Spdx2to3Converter.java b/src/main/java/org/spdx/library/conversion/Spdx2to3Converter.java index f16fc101..97d20a13 100644 --- a/src/main/java/org/spdx/library/conversion/Spdx2to3Converter.java +++ b/src/main/java/org/spdx/library/conversion/Spdx2to3Converter.java @@ -726,7 +726,7 @@ public NamespaceMap convertAndStore(org.spdx.library.model.v2.ExternalDocumentRe NamespaceMap toNamespaceMap = (NamespaceMap)SpdxModelClassFactoryV3.getModelObject(toModelStore, toObjectUri, SpdxConstantsV3.CORE_NAMESPACE_MAP, copyManager, true, defaultUriPrefix); toNamespaceMap.setPrefix(externalDocRef.getId()); - toNamespaceMap.setNamespace(externalDocRef.getSpdxDocumentNamespace()); + toNamespaceMap.setNamespace(externalDocRef.getSpdxDocumentNamespace() + "#"); return toNamespaceMap; } diff --git a/src/main/java/org/spdx/storage/simple/InMemSpdxStore.java b/src/main/java/org/spdx/storage/simple/InMemSpdxStore.java index f27cec70..b8337142 100644 --- a/src/main/java/org/spdx/storage/simple/InMemSpdxStore.java +++ b/src/main/java/org/spdx/storage/simple/InMemSpdxStore.java @@ -414,10 +414,10 @@ public void leaveCriticalSection(IModelStoreLock lock) { } @Override - public Optional getCaseSensisitiveId(String nameSpace, String caseInsensisitiveId) { + public Optional getCaseSensitiveId(String nameSpace, String caseInsensitiveId) { Objects.requireNonNull(nameSpace, "Namespace can not be null"); - Objects.requireNonNull(caseInsensisitiveId, "CaseInsensisitiveId can not be null"); - String objectUri = nameSpace + "#" + caseInsensisitiveId; + Objects.requireNonNull(caseInsensitiveId, "CaseInsensitiveId can not be null"); + String objectUri = nameSpace + "#" + caseInsensitiveId; StoredTypedItem item = typedValueMap.get(objectUri.toLowerCase()); if (Objects.isNull(item)) { return Optional.empty(); diff --git a/src/main/java/org/spdx/storage/simple/StoredTypedItem.java b/src/main/java/org/spdx/storage/simple/StoredTypedItem.java index 309a61bf..32b44559 100644 --- a/src/main/java/org/spdx/storage/simple/StoredTypedItem.java +++ b/src/main/java/org/spdx/storage/simple/StoredTypedItem.java @@ -120,6 +120,8 @@ public void setValue(PropertyDescriptor propertyDescriptor, Object value) throws !String.class.isAssignableFrom(value.getClass()) && !Boolean.class.isAssignableFrom(value.getClass()) && !Integer.class.isAssignableFrom(value.getClass()) && + !Double.class.isAssignableFrom(value.getClass()) && + !Float.class.isAssignableFrom((value.getClass())) && !TypedValue.class.isAssignableFrom(value.getClass()) && !(value instanceof IndividualUriValue)) { throw new SpdxInvalidTypeException(value.getClass() +" is not a supported class to be stored.");