chore: Fabric8NameHelper renames fields with reserved keywords

Signed-off-by: Marc Nuri <[email protected]>
fabric8io · Aug 29, 2022 · 774f716 · 774f716
1 parent c568ea4
commit 774f716
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 348 deletions.
diff --git a/extensions/certmanager/model-v1/pom.xml b/extensions/certmanager/model-v1/pom.xml
@@ -93,9 +93,6 @@
             <configuration>
               <target>
                 <echo>removing the duplicate generated class</echo>
-                <delete
-                  file="${generate.targetDirectory}/io/fabric8/certmanager/api/model/acme/v1/ACMEChallengeSolverHTTP01Ingress.java"
-                  verbose="true" />
                 <delete
                   file="${generate.targetDirectory}/io/fabric8/certmanager/api/model/v1/CertificateRequestSpec.java"
                   verbose="true" />

diff --git a/.../main/java/io/fabric8/certmanager/api/model/acme/v1/ACMEChallengeSolverHTTP01Ingress.java b/.../main/java/io/fabric8/certmanager/api/model/acme/v1/ACMEChallengeSolverHTTP01Ingress.java
diff --git a/...er/model-v1/src/main/java/io/fabric8/certmanager/api/model/v1/CertificateRequestSpec.java b/...er/model-v1/src/main/java/io/fabric8/certmanager/api/model/v1/CertificateRequestSpec.java
diff --git a/...sonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/Fabric8NameHelper.java b/...sonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/Fabric8NameHelper.java
@@ -20,24 +20,38 @@
 import org.jsonschema2pojo.GenerationConfig;
 import org.jsonschema2pojo.util.NameHelper;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
+ * Renames reserved fields name to predefined values (PROTECTED_WORD_MAP)
+ * <p>
  * Overrides default provided NameHelper to overcome getter/setter naming convention mismatch between Sundr.io
  * and jsonschema2pojo.
- *
+ * <p>
  * There are issues with properties such as x-kubernetes-foo or xKubernetesFoo, sundrio expects a getter as
  * getXKubernetesFoo while jsonschema2pojo produces getxKubernetesFoo.
  */
 public class Fabric8NameHelper extends NameHelper {
 
+  private static final Map<String, String> PROTECTED_WORD_MAP = new HashMap<>();
+  static {
+    PROTECTED_WORD_MAP.put("class", "className");
+  }
   private static final Pattern SINGLE_LETTER_PREFIX_WORD_PROPERTY = Pattern.compile("^[a-z]((-[a-zA-Z])|[A-Z])(.*)$");
 
   public Fabric8NameHelper(GenerationConfig generationConfig) {
     super(generationConfig);
   }
 
+  @Override
+  public String getFieldName(String propertyName, JsonNode node) {
+    final String fieldName = super.getFieldName(propertyName, node);
+    return PROTECTED_WORD_MAP.getOrDefault(fieldName, fieldName);
+  }
+
   @Override
   public String getGetterName(String propertyName, JType type, JsonNode node) {
     return correctCamelCaseWithPrefix(propertyName, super.getGetterName(propertyName, type, node));