Bump SPDX Java library version

Also fixes some compiler warnings

Author: goneall

pom.xml

@@ -146,7 +146,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>com.google.code.gson</groupId>

src/main/java/org/spdx/v3jsonldstore/JsonLDDeserializer.java

@@ -228,7 +228,7 @@ private synchronized TypedValue deserializeCoreObject(JsonNode node, String defa
 				PropertyDescriptor property;
 				try {
 					Optional<PropertyDescriptor> optDesc = jsonFieldNameToProperty(field.getKey(), tv.getSpecVersion());
-					if (!optDesc.isPresent()) {
+					if (optDesc.isEmpty()) {
 						throw new InvalidSPDXAnalysisException("No property descriptor for field "+field.getKey());
 					}
 					property = optDesc.get();
@@ -286,7 +286,7 @@ private TypedValue getOrCreateCoreObject(JsonNode node,
 				id = jsonNodeId;
 			}
 			type = typeNodeToType(node.get("type"));
-			if (!type.isPresent()) {
+			if (type.isEmpty()) {
 				logger.error("Missing type for core object {}", node);
 				throw new InvalidSPDXAnalysisException("Missing type for core object " + node);
 			}
@@ -315,7 +315,7 @@ private Object toStoredObject(String propertyName, JsonNode value, String specVe
 			case ARRAY:
 				throw new InvalidSPDXAnalysisException("Can not convert a JSON array to a stored object");
 			case BOOLEAN: {
-				if (!propertyType.isPresent() || JsonLDSchema.BOOLEAN_TYPES.contains(propertyType.get())) {
+				if (propertyType.isEmpty() || JsonLDSchema.BOOLEAN_TYPES.contains(propertyType.get())) {
 					return value.asBoolean();
 				} else if (JsonLDSchema.STRING_TYPES.contains(propertyType.get())) {
 					return value.asText();
@@ -325,7 +325,7 @@ private Object toStoredObject(String propertyName, JsonNode value, String specVe
 			}
 			case NULL: throw new InvalidSPDXAnalysisException("Can not convert a JSON NULL to a stored object");
 			case NUMBER: {
-				if (!propertyType.isPresent() || JsonLDSchema.INTEGER_TYPES.contains(propertyType.get())) {
+				if (propertyType.isEmpty() || JsonLDSchema.INTEGER_TYPES.contains(propertyType.get())) {
 					return value.asInt();
 				} else if (JsonLDSchema.DOUBLE_TYPES.contains(propertyType.get())) {
 					return value.asDouble();
@@ -363,13 +363,13 @@ private Object jsonStringToStoredValue(String propertyName, JsonNode jsonValue,
 		} else if (schema.isEnum(propertyName)) {
 			// we can assume that the @vocab points to the prefix for the enumerations
 			Optional<String> vocab = schema.getVocab(propertyName);
-			if (!vocab.isPresent()) {
+			if (vocab.isEmpty()) {
 				throw new InvalidSPDXAnalysisException("Missing vocabulary for enum property "+propertyName);
 			}
 			return new SimpleUriValue(vocab.get() + jsonValue.asText());
 		} else {
 			Optional<String> propertyType = schema.getPropertyType(propertyName);
-			if (!propertyType.isPresent()) {
+			if (propertyType.isEmpty()) {
 				logger.warn("Missing property type for value {}.  Defaulting to a string type", jsonValue);
 				return jsonValue.asText();
 			} else if (JsonLDSchema.STRING_TYPES.contains(propertyType.get())) {
@@ -503,7 +503,7 @@ public TypedValue deserializeElement(JsonNode elementNode) throws GenerationExce
 				throw new InvalidSPDXAnalysisException("Can not serialize an anonymous (blank) element");
 			}
 			Optional<String> type = typeNodeToType(elementNode.get("type"));
-			if (!type.isPresent()) {
+			if (type.isEmpty()) {
 				throw new InvalidSPDXAnalysisException("Missing type for element "+id);
 			}
 			String specVersion = getSpecVersionFromNode(elementNode, creationInfoIdToSpecVersion, 

src/main/java/org/spdx/v3jsonldstore/JsonLDSchema.java

@@ -460,7 +460,7 @@ public boolean isSpdxObject(String propertyName) {
 			return false;
 		}
 		Optional<JsonNode> shacl = getPropertyShacl(propertyName);
-		if (!shacl.isPresent()) {
+		if (shacl.isEmpty()) {
 			return false;
 		}
 		boolean objectType = false;
@@ -511,7 +511,7 @@ public boolean isIndividual(String propertyName, String propertyValue) {
 	 */
 	public boolean isEnum(String propertyName) {
 		Optional<String> type = getPropertyType(propertyName);
-		if (!type.isPresent()) {
+		if (type.isEmpty()) {
 			return false;
 		}
 		if (!"@vocab".equals(type.get())) {

src/main/java/org/spdx/v3jsonldstore/JsonLDSerializer.java

@@ -54,7 +54,7 @@
  * <p>
  * The <code>serialize()</code> method will serialize the <code>@graph</code> for all SPDX elements
  * stored in the model store.
- * 
+ * </p>
  * The <code>serialize(SpdxElement element)</code> will serialize a single element.
  * 
  * @author Gary O'Neall
@@ -64,7 +64,7 @@ public class JsonLDSerializer {
 
 	static final Logger logger = LoggerFactory.getLogger(JsonLDSerializer.class);
 
-	static final Comparator<JsonNode> NODE_COMPARATOR = new Comparator<JsonNode>() {
+	static final Comparator<JsonNode> NODE_COMPARATOR = new Comparator<>() {
 
 		@Override
 		public int compare(JsonNode arg0, JsonNode arg1) {