remove leading space

OpenAPITools · May 17, 2019 · 6551a08 · 6551a08
1 parent 59eadba
commit 6551a08
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 64 deletions.
diff --git a/...enerator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java b/...enerator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java
@@ -59,7 +59,6 @@ public JavaJAXRSSpecServerCodegen() {
         updateOption(CodegenConstants.ARTIFACT_ID, this.getArtifactId());
         updateOption(CodegenConstants.API_PACKAGE, apiPackage);
         updateOption(CodegenConstants.MODEL_PACKAGE, modelPackage);
-        removeOption(CodegenConstants.LIBRARY);
 
         modelTemplateFiles.put("model.mustache", ".java");
         apiTemplateFiles.put("api.mustache", ".java");
@@ -81,6 +80,7 @@ public JavaJAXRSSpecServerCodegen() {
 
         super.embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "spec";
 
+        removeOption(CodegenConstants.LIBRARY);
         CliOption library = new CliOption(CodegenConstants.LIBRARY, CodegenConstants.LIBRARY_DESC).defaultValue(DEFAULT_LIBRARY);
         Map<String, String> supportedLibraries = new LinkedHashMap<>();
         supportedLibraries.put(DEFAULT_LIBRARY, "JAXRS");

diff --git a/modules/openapi-generator/src/main/resources/Groovy/api.mustache b/modules/openapi-generator/src/main/resources/Groovy/api.mustache
@@ -20,12 +20,14 @@ class {{classname}} {
         def bodyParams
         def contentType
 
-        {{#allParams}}{{#required}}
+        {{#allParams}}
+        {{#required}}
         // verify required params are set
         if ({{paramName}} == null) {
             throw new RuntimeException("missing required params {{paramName}}")
         }
-        {{/required}}{{/allParams}}
+        {{/required}}
+        {{/allParams}}
 
         {{#queryParams}}
         if ({{paramName}} != null) {
@@ -53,7 +55,9 @@ class {{classname}} {
         {{/hasMore}}
         {{#hasMore}}
         bodyParams = [:]
-        bodyParams.put("{{baseName}}", {{paramName}}){{/hasMore}}{{/bodyParams.0}}
+        bodyParams.put("{{baseName}}", {{paramName}})
+        {{/hasMore}}
+        {{/bodyParams.0}}
         {{#bodyParams}}
         {{#secondaryParam}}
         bodyParams.put("{{baseName}}", {{paramName}})

diff --git a/samples/client/petstore/groovy/src/main/groovy/org/openapitools/api/PetApi.groovy b/samples/client/petstore/groovy/src/main/groovy/org/openapitools/api/PetApi.groovy
@@ -18,20 +18,17 @@ class PetApi {
         def bodyParams
         def contentType
 
-
         // verify required params are set
         if (body == null) {
             throw new RuntimeException("missing required params body")
         }
-
 
 
 
         contentType = 'application/json';
         bodyParams = body
 
 
-
         apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
                     "POST", "",
                     null )
@@ -47,12 +44,10 @@ class PetApi {
         def bodyParams
         def contentType
 
-
         // verify required params are set
         if (petId == null) {
             throw new RuntimeException("missing required params petId")
         }
-
 
 
         if (apiKey != null) {
@@ -61,7 +56,6 @@ class PetApi {
 
 
 
-
         apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
                     "DELETE", "",
                     null )
@@ -77,12 +71,10 @@ class PetApi {
         def bodyParams
         def contentType
 
-
         // verify required params are set
         if (status == null) {
             throw new RuntimeException("missing required params status")
         }
-
 
         if (status != null) {
             queryParams.put("status", status)
@@ -91,7 +83,6 @@ class PetApi {
 
 
 
-
         apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
                     "GET", "array",
                     Pet.class )
@@ -107,12 +98,10 @@ class PetApi {
         def bodyParams
         def contentType
 
-
         // verify required params are set
         if (tags == null) {
             throw new RuntimeException("missing required params tags")
         }
-
 
         if (tags != null) {
             queryParams.put("tags", tags)
@@ -121,7 +110,6 @@ class PetApi {
 
 
 
-
         apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
                     "GET", "array",
                     Pet.class )
@@ -137,13 +125,10 @@ class PetApi {
         def bodyParams
         def contentType
 
-
         // verify required params are set
         if (petId == null) {
             throw new RuntimeException("missing required params petId")
         }
-
-
 
 
 
@@ -164,20 +149,17 @@ class PetApi {
         def bodyParams
         def contentType
 
-
         // verify required params are set
         if (body == null) {
             throw new RuntimeException("missing required params body")
         }
-
 
 
 
         contentType = 'application/json';
         bodyParams = body
 
 
-
         apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
                     "PUT", "",
                     null )
@@ -193,13 +175,10 @@ class PetApi {
         def bodyParams
         def contentType
 
-
         // verify required params are set
         if (petId == null) {
             throw new RuntimeException("missing required params petId")
         }
-
-
 
 
 
@@ -224,13 +203,10 @@ class PetApi {
         def bodyParams
         def contentType
 
-
         // verify required params are set
         if (petId == null) {
             throw new RuntimeException("missing required params petId")
         }
-
-
 
 
 

diff --git a/samples/client/petstore/groovy/src/main/groovy/org/openapitools/api/StoreApi.groovy b/samples/client/petstore/groovy/src/main/groovy/org/openapitools/api/StoreApi.groovy
@@ -17,13 +17,10 @@ class StoreApi {
         def bodyParams
         def contentType
 
-
         // verify required params are set
         if (orderId == null) {
             throw new RuntimeException("missing required params orderId")
         }
-
-
 
 
 
@@ -44,8 +41,6 @@ class StoreApi {
         def bodyParams
         def contentType
 
-
-
 
 
 
@@ -66,13 +61,10 @@ class StoreApi {
         def bodyParams
         def contentType
 
-
         // verify required params are set
         if (orderId == null) {
             throw new RuntimeException("missing required params orderId")
         }
-
-
 
 
 
@@ -93,20 +85,17 @@ class StoreApi {
         def bodyParams
         def contentType
 
-
         // verify required params are set
         if (body == null) {
             throw new RuntimeException("missing required params body")
         }
-
 
 
 
         contentType = 'application/json';
         bodyParams = body
 
 
-
         apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
                     "POST", "",
                     Order.class )