From aa3f8b4bd88fb37357abc35999ece92e1ec1dd41 Mon Sep 17 00:00:00 2001
From: Gary O'Neall <gary@sourceauditor.com>
Date: Thu, 9 Jan 2025 14:33:39 -0800
Subject: [PATCH] Translate any reserved property names in constants file

---
 .../org/spdx/tools/model2java/ShaclToJava.java     | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/spdx/tools/model2java/ShaclToJava.java b/src/main/java/org/spdx/tools/model2java/ShaclToJava.java
index bbba2af..ec85fc4 100644
--- 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);