JNG-5527 Fix java reserwed keywords for operations (#25)

BlackBeltTechnology · Feb 15, 2024 · b1c995c · b1c995c
1 parent 4d5b435
commit b1c995c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/...rs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/JavaNamespaceHelper.java b/...rs-api/src/main/java/hu/blackbelt/judo/psm/generator/jackson/api/JavaNamespaceHelper.java
@@ -53,7 +53,7 @@ public static String safeName(String str) {
                 "public", "requires", "return", "short", "static", "strictfp", "super",
                 "switch", "synchronized", "this", "throw", "throws", "transient", "try",
                 "void", "volatile", "while", "true", "null", "false", "var", "const", "goto",
-                "class", "Class", "int", "interface").contains(str)) {
+                "class", "Class", "int", "interface", "default").contains(str)) {
             return str + "_";
         } else {
             return str;

diff --git a/judo-psm-generator-jaxrs-api/src/main/resources/rest/api/rest.service.java.hbs b/judo-psm-generator-jaxrs-api/src/main/resources/rest/api/rest.service.java.hbs
@@ -9,17 +9,17 @@ public interface {{ self.className }} {
     public void __unbindDispatcher(hu.blackbelt.judo.dispatcher.api.Dispatcher dispatcher);
     {{# each self.operations as | operation | }}
 
-    public javax.ws.rs.core.Response {{ operation.name }}(
+    public javax.ws.rs.core.Response {{ safeName operation.name }}(
     @javax.ws.rs.core.Context javax.ws.rs.core.SecurityContext securityContext
     , @javax.ws.rs.HeaderParam("X-Judo-CountRecords") java.lang.String __countRecords
     {{# if operation.isBoundOperation }}
     , @javax.ws.rs.HeaderParam("X-Judo-SignedIdentifier") java.lang.String __signedIdentifier
     {{/ if }}
     {{# if operation.input }}
     {{# if operation.input.isMany }}
-    , java.util.List<java.util.Map<java.lang.String, java.lang.Object>> {{ operation.input.name.firstToLower }}
+    , java.util.List<java.util.Map<java.lang.String, java.lang.Object>> {{ safeName operation.input.name.firstToLower }}
     {{ else }}
-    , java.util.Map<java.lang.String, java.lang.Object> {{ operation.input.name.firstToLower }}
+    , java.util.Map<java.lang.String, java.lang.Object> {{ safeName operation.input.name.firstToLower }}
     {{/ if }}
     {{/ if }}
     );

diff --git a/judo-psm-generator-jaxrs-impl/src/main/resources/rest/impl/rest.service.impl.java.hbs b/judo-psm-generator-jaxrs-impl/src/main/resources/rest/impl/rest.service.impl.java.hbs
@@ -93,7 +93,7 @@ public class {{ implClassName self }} implements {{ namedElementApiRestFqName se
     @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "Not found.")
     @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "422", description = "Business fault")
     @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "500", description = "Internal server error.")
-    public javax.ws.rs.core.Response {{ operation.name }}(
+    public javax.ws.rs.core.Response {{ safeName operation.name }}(
         @javax.ws.rs.core.Context javax.ws.rs.core.SecurityContext securityContext, @javax.ws.rs.HeaderParam("X-Judo-CountRecords") java.lang.String __countRecords
         {{# if operation.isBoundOperation }}
         , @javax.ws.rs.HeaderParam("X-Judo-SignedIdentifier") java.lang.String __signedIdentifier
@@ -115,7 +115,7 @@ public class {{ implClassName self }} implements {{ namedElementApiRestFqName se
                         )
                  )
          )
-         java.util.List<java.util.Map<java.lang.String, java.lang.Object>> {{ operation.input.name.firstToLower }}
+         java.util.List<java.util.Map<java.lang.String, java.lang.Object>> {{ safeName operation.input.name.firstToLower }}
         {{ else }}
         ,
         @io.swagger.v3.oas.annotations.parameters.RequestBody(
@@ -129,7 +129,7 @@ public class {{ implClassName self }} implements {{ namedElementApiRestFqName se
                         )
                 )
         )
-        java.util.Map<java.lang.String, java.lang.Object> {{ operation.input.name.firstToLower }}
+        java.util.Map<java.lang.String, java.lang.Object> {{ safeName operation.input.name.firstToLower }}
         {{/ if }}
         {{/ if }}
     ) {