Merge pull request #9 from spdx/fixpropuris

Translate any reserved property names in constants file
spdx · Jan 9, 2025 · b738eaa · b738eaa
2 parents c98180f + aa3f8b4
commit b738eaa
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/main/java/org/spdx/tools/model2java/ShaclToJava.java b/src/main/java/org/spdx/tools/model2java/ShaclToJava.java
@@ -656,7 +656,19 @@ private void generateSpdxConstants(File dir, List<String> classUris) throws IOEx
 				String propertyName = uriToPropertyName.get(propUri);
 				String propertyConstantName = propertyNameToPropertyConstant(propertyName, namespaceName);
 				propMustacheMap.put("propertyConstantName", propertyConstantName);
-				propMustacheMap.put("propertyConstantValue", propertyName);
+				String uriPropName = null;
+				if (RESERVED_JAVA_WORDS.containsValue(propertyName)) {
+					for (Entry<String, String> entry:RESERVED_JAVA_WORDS.entrySet()) {
+						if (entry.getValue().equals(propertyName)) {
+							uriPropName = entry.getKey();
+							break;
+						}
+					}
+				}
+				if (Objects.isNull(uriPropName)) {
+					uriPropName = propertyName;;
+				}
+				propMustacheMap.put("propertyConstantValue", uriPropName);
 				propMustacheList.add(propMustacheMap);
 			}
 			namespaceMustacheMap.put("propertyDescriptors", propMustacheList);