fix with corner cases in templates

ZenWave360 · Dec 19, 2024 · e862bb5 · e862bb5
1 parent 35271c4
commit e862bb5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...k/plugins/OpenAPIControllersGenerator/src/main/java/web/mvc/ServiceApiController.java.hbs b/...k/plugins/OpenAPIControllersGenerator/src/main/java/web/mvc/ServiceApiController.java.hbs
@@ -66,7 +66,7 @@ public class {{serviceName}}ApiController implements {{serviceName}}Api {
 
     @Override
     public ResponseEntity<{{{responseEntityExpression}}}> {{operationId}}({{{methodParameters}}}) {
-        log.debug("REST request to {{operationId}}: {{methodParameterPlaceholders}}", {{methodParameterInstances}});
+        log.debug("REST request to {{operationId}}: {{methodParameterPlaceholders}}"{{#if methodParameters}}, {{methodParameterInstances}}{{/if}});
     {{~#if (eq httpMethod 'patch')~}}
     {{~else if requestBodySchema~}}
         var {{mappedInputVariable}} = mapper.as{{serviceMethodParameter}}({{reqBodyVariableName}});

diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/JsonSchemaToJsonFaker.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/generators/JsonSchemaToJsonFaker.java
@@ -79,6 +79,9 @@ protected Object generateObject(String propertyName, Map<String, Object> schema)
 
     protected Object generateValue(String propertyName, Map<String, Object> schemaNode) {
         String type = (String) schemaNode.get("type");
+        if ((type == null)) {
+            return null;
+        }
 
         return switch (type) {
             case "string" -> generateString(propertyName, schemaNode);