[java-generator] handle more special characters in field names

Author: miriSch

CHANGELOG.md

@@ -3,7 +3,8 @@
 ### 6.7-SNAPSHOT
 
 #### Bugs
-Fix #5145: [java-generator] handle `additionalProperties: true` emitting a field of type `AnyType`
+* Fix #5145: [java-generator] handle `additionalProperties: true` emitting a field of type `AnyType`
+* Fix #5164: [java-generator] handle more special characters in field names
 
 #### Improvements
 

java-generator/core/src/main/java/io/fabric8/java/generator/nodes/AbstractJSONSchema2Pojo.java

@@ -26,6 +26,7 @@
 
 import java.util.Locale;
 import java.util.function.Function;
+import java.util.stream.Collector;
 
 import static io.fabric8.java.generator.nodes.Keywords.JAVA_KEYWORDS;
 
@@ -131,10 +132,10 @@ public static String sanitizeString(String str) {
       index = sanitized.indexOf('-');
     }
 
-    sanitized = sanitized.replace('.', '_');
-    sanitized = sanitized.replace(' ', '_');
-    sanitized = sanitized.replace('\'', '_');
-    sanitized = sanitized.replace('\"', '_');
+    sanitized = sanitized.chars()
+        .mapToObj(character -> (char) character)
+        .map(originalChar -> Character.isJavaIdentifierPart(originalChar) ? originalChar : '_')
+        .collect(Collector.of(StringBuilder::new, StringBuilder::append, StringBuilder::append, StringBuilder::toString));
 
     return sanitized;
   }

java-generator/core/src/test/resources/dummy-crd.yml

@@ -41,6 +41,8 @@ spec:
                   type: string
                 four"doublequote:
                   type: string
+                five/slash:
+                  type: string
   scope: Namespaced
   names:
     plural: dummies

java-generator/it/src/it/escape-characters/src/test/java/io/fabric8/it/dummy/TestEscapeCharacters.java

@@ -47,6 +47,7 @@ void testDeserialization() {
     assertEquals("2", spec.getTwo_space());
     assertEquals("3", spec.getThree_quote());
     assertEquals("4", spec.getFour_doublequote());
+    assertEquals("5", spec.getFive_slash());
   }
 
   @Test
@@ -61,6 +62,7 @@ void testAgainstSample() throws Exception {
     spec.setTwo_space("2");
     spec.setThree_quote("3");
     spec.setFour_doublequote("4");
+    spec.setFive_slash("5");
     sample.setSpec(spec);
     ObjectMeta om = new ObjectMeta();
     om.setName("sample");

java-generator/it/src/it/escape-characters/src/test/resources/dummy-crd.yml

@@ -41,6 +41,8 @@ spec:
                   type: string
                 four"doublequote:
                   type: string
+                five/slash:
+                  type: string
   scope: Namespaced
   names:
     plural: dummies

java-generator/it/src/it/escape-characters/src/test/resources/sample.yaml

@@ -24,3 +24,4 @@ spec:
   two space: "2"
   three'quote: "3"
   four"doublequote: "4"
+  five/slash: "5"