@@ -665,12 +665,7 @@ public Optional<Object> getPropertyValue(String id, String propertyName) throws
665665 Property property = model .createProperty (SpdxResourceFactory .propertyNameToUri (propertyName ));
666666 NodeIterator iter = model .listObjectsOfProperty (idResource , property );
667667 if (!iter .hasNext ()) {
668- if (isListedLicenseOrException (idResource )) {
669- return ListedLicenses .getListedLicenses ().getLicenseModelStore ()
670- .getValue (HTTPS_LISTED_LICENSE_NAMESPACE_PREFIX , id , propertyName );
671- } else {
672- return Optional .empty ();
673- }
668+ return Optional .empty ();
674669 }
675670 Optional <Object > result = valueNodeToObject (iter .next (), property );
676671 if (iter .hasNext ()) {
@@ -683,24 +678,6 @@ public Optional<Object> getPropertyValue(String id, String propertyName) throws
683678 }
684679 }
685680
686- /**
687- * @param idResource Resource for the ID
688- * @return true if the type of the ID is a ListedLicenseException or a Listed License
689- */
690- private boolean isListedLicenseOrException (Resource idResource ) {
691- Resource valueType = idResource .getPropertyResourceValue (RDF .type );
692- if (Objects .isNull (valueType )) {
693- return false ;
694- }
695- Optional <String > sValueType = SpdxResourceFactory .resourceToSpdxType (valueType );
696- if (sValueType .isEmpty ()) {
697- return false ;
698- }
699- String sValueTypeStr = sValueType .get ();
700- return SpdxConstants .CLASS_SPDX_LISTED_LICENSE .equals (sValueTypeStr ) ||
701- SpdxConstants .CLASS_SPDX_LISTED_LICENSE_EXCEPTION .equals (sValueTypeStr );
702- }
703-
704681 /**
705682 * Convert a node in the RDF graph to a Java object
706683 * @param propertyValue node containing the value
0 commit comments