@@ -848,28 +848,29 @@ public OrLaterOperator convertAndStore(org.spdx.library.model.v2.license.OrLater
848848
849849 /**
850850 * Converts an SPDX spec version 2 SPDX InvalidLicenseExpression to an SPDX spec version 3 SPDX InvalidLicenseExpression and store the result
851- * @param fromInvalidExpression an SPDX spec version 2 InvalidLicenseExpression
851+ * @param fromInvalidLicenseExpression an SPDX spec version 2 InvalidLicenseExpression
852852 * @return an SPDX spec version 3 InvalidLicenseExpression
853853 * @throws InvalidSPDXAnalysisException on any errors converting
854854 */
855- public InvalidLicenseExpression convertAndStore (org .spdx .library .model .v2 .license .InvalidLicenseExpression fromInvalidExpression ) throws InvalidSPDXAnalysisException {
856- Optional <ModelObjectV3 > existing = getExistingObject (fromInvalidExpression .getObjectUri (),
855+ public InvalidLicenseExpression convertAndStore (org .spdx .library .model .v2 .license .InvalidLicenseExpression fromInvalidLicenseExpression )
856+ throws InvalidSPDXAnalysisException {
857+ Optional <ModelObjectV3 > existing = getExistingObject (fromInvalidLicenseExpression .getObjectUri (),
857858 "SimpleLicensing.InvalidLicenseExpression" ); //TODO: This should be included in the SPDXV3 Constants file
858859 if (existing .isPresent ()) {
859860 return (InvalidLicenseExpression )existing .get ();
860861 }
861862 String toObjectUri = toModelStore .getNextId (IdType .Anonymous );
862- String existingUri = this .alreadyConverted .putIfAbsent (fromInvalidExpression .getObjectUri (), toObjectUri );
863+ String existingUri = this .alreadyConverted .putIfAbsent (fromInvalidLicenseExpression .getObjectUri (), toObjectUri );
863864 if (Objects .nonNull (existingUri )) {
864865 // small window if conversion occurred since the last check already converted
865- return (InvalidLicenseExpression )getExistingObject (fromInvalidExpression .getObjectUri (),
866+ return (InvalidLicenseExpression )getExistingObject (fromInvalidLicenseExpression .getObjectUri (),
866867 "SimpleLicensing.InvalidLicenseExpression" ).get ();
867868 }
868869 InvalidLicenseExpression toInvalidLicExpression = (InvalidLicenseExpression )SpdxModelClassFactoryV3 .getModelObject (toModelStore ,
869870 toObjectUri , "SimpleLicensing.InvalidLicenseExpression" , copyManager , true , defaultUriPrefix );
870871 toInvalidLicExpression .setCreationInfo (defaultCreationInfo );
871- toInvalidLicExpression .setMessage (fromInvalidExpression .getMessage ());
872- toInvalidLicExpression .setLicenseExpression (fromInvalidExpression .getMessage ());
872+ toInvalidLicExpression .setMessage (fromInvalidLicenseExpression .getMessage ());
873+ toInvalidLicExpression .setLicenseExpression (fromInvalidLicenseExpression .getMessage ());
873874 return toInvalidLicExpression ;
874875 }
875876
0 commit comments