Merge pull request #65 from spdx/renunknown

Update to latest Java library version

Author: goneall

pom.xml

@@ -118,7 +118,7 @@
     <dependency>
     	<groupId>org.spdx</groupId>
     	<artifactId>java-spdx-library</artifactId>
-    	<version>2.0.0-RC1</version>
+    	<version>2.0.0-RC2</version>
     </dependency>
     <dependency>
     	<groupId>org.apache.jena</groupId>

src/main/java/org/spdx/spdxRdfStore/RdfSpdxModelManager.java

@@ -105,7 +105,7 @@ public class RdfSpdxModelManager implements IModelStoreLock {
 
 	public class RdfListIterator implements Iterator<Object> {
 
-		NodeIterator listIterator;
+		final NodeIterator listIterator;
 		private final Property property;
 
 		public RdfListIterator(Resource idResource, Property property) {
@@ -171,7 +171,7 @@ public void removedStatement(Statement s) {
 	private final NextIdListener nextIdListener = new NextIdListener();
 
 	private final String documentUri;
-	protected Model model;
+	final protected Model model;
 	/**
 	 * Map of a lower case ID to the case-sensitive ID
 	 */

src/main/java/org/spdx/spdxRdfStore/RdfStore.java

@@ -65,11 +65,11 @@ public class RdfStore implements IModelStore, ISerializableModelStore {
 	static final Logger logger = LoggerFactory.getLogger(RdfStore.class.getName());
 
 	static final String GENERATED = "gnrtd";
-	static Pattern DOCUMENT_ID_PATTERN_GENERATED = Pattern.compile(SpdxConstantsCompatV2.EXTERNAL_DOC_REF_PRENUM+GENERATED+"(\\d+)$");
-	static Pattern SPDX_ID_PATTERN_GENERATED = Pattern.compile(SpdxConstantsCompatV2.SPDX_ELEMENT_REF_PRENUM+GENERATED+"(\\d+)$");
-	static Pattern LICENSE_ID_PATTERN_GENERATED = Pattern.compile(SpdxConstantsCompatV2.NON_STD_LICENSE_ID_PRENUM+GENERATED+"(\\d+)$");
+	static final Pattern DOCUMENT_ID_PATTERN_GENERATED = Pattern.compile(SpdxConstantsCompatV2.EXTERNAL_DOC_REF_PRENUM+GENERATED+"(\\d+)$");
+	static final Pattern SPDX_ID_PATTERN_GENERATED = Pattern.compile(SpdxConstantsCompatV2.SPDX_ELEMENT_REF_PRENUM+GENERATED+"(\\d+)$");
+	static final Pattern LICENSE_ID_PATTERN_GENERATED = Pattern.compile(SpdxConstantsCompatV2.NON_STD_LICENSE_ID_PRENUM+GENERATED+"(\\d+)$");
 	static final String ANON_PREFIX = "__anon__";
-	static Pattern ANON_ID_PATTERN = Pattern.compile(ANON_PREFIX+"(.+)$");
+	static final Pattern ANON_ID_PATTERN = Pattern.compile(ANON_PREFIX+"(.+)$");
 	RdfSpdxModelManager modelManager;
 	String documentUri;
 	boolean dontStoreLicenseDetails = false;
@@ -84,10 +84,9 @@ public class RdfStore implements IModelStore, ISerializableModelStore {
 	 * Create an RDF store and initialize it with an SPDX document deserialized from stream
 	 * Note that the stream must contain one and only one SPDX document in SPDX version 2.X format
 	 * @param stream input stream of a model
-	 * @throws IOException on IO error
 	 * @throws InvalidSPDXAnalysisException on SPDX parsing errors
 	 */
-	public RdfStore(InputStream stream) throws InvalidSPDXAnalysisException, IOException {
+	public RdfStore(InputStream stream) throws InvalidSPDXAnalysisException {
 		deSerialize(stream, false);
 	}
 
@@ -100,13 +99,12 @@ public RdfStore() {
 	}
 
 	/**
-	 * Create an RDF store and initialize it with an data deserialized from stream using the documentUri
+	 * Create an RDF store and initialize it with a data deserialized from stream using the documentUri
 	 * for ID prefixes
 	 * @param stream stream of an RDF model
-	 * @throws IOException on IO error
 	 * @throws InvalidSPDXAnalysisException on SPDX parsing errors
 	 */
-	public RdfStore(InputStream stream, String documentUri) throws InvalidSPDXAnalysisException, IOException {
+	public RdfStore(InputStream stream, String documentUri) throws InvalidSPDXAnalysisException {
 		this.documentUri = documentUri;
 		deSerialize(stream, false, documentUri);
 	}
@@ -222,7 +220,7 @@ public IdType getIdType(String objectUri) {
 			id = CompatibleModelStoreWrapper.objectUriToId(false, objectUri, documentUri);
 		} catch (InvalidSPDXAnalysisException e) {
             logger.warn("Error converting object URI to ID for URI: {}", objectUri, e);
-			return IdType.Unkown;
+			return IdType.Unknown;
 		}
 		if (SpdxConstantsCompatV2.LICENSE_ID_PATTERN.matcher(id).matches()) {
 			return IdType.LicenseRef;
@@ -233,7 +231,7 @@ public IdType getIdType(String objectUri) {
 		if (SpdxConstantsCompatV2.SPDX_ELEMENT_REF_PATTERN.matcher(id).matches()) {
 			return IdType.SpdxId;
 		}
-		return IdType.Unkown;
+		return IdType.Unknown;
 	}
 
 	/* (non-Javadoc)
@@ -645,7 +643,7 @@ public void deSerialize(InputStream stream, boolean overwrite, String documentNa
     }
 
 	@Override
-	public Optional<String> getCaseSensisitiveId(String documentUri, String caseInsensisitiveId) {
+	public Optional<String> getCaseSensitiveId(String documentUri, String caseInsensisitiveId) {
 		if (Objects.isNull(modelManager)) {
 			return Optional.empty();
 		}
@@ -675,7 +673,7 @@ public void delete(String objectUri) throws InvalidSPDXAnalysisException {
 	}
 
 	@Override
-	public void close() throws Exception {
+	public void close() {
 		if (Objects.nonNull(modelManager)) {
 			modelManager.close();
 			modelManager = null;