Update Groovy default value, fix import error when doing "gradle test" (

#203) * update groovy default value, fix import error when doing gradle test * remove empty lines
OpenAPITools · Apr 23, 2018 · b908b73 · b908b73
1 parent 16589de
commit b908b73
Show file tree

Hide file tree

Showing 24 changed files with 35 additions and 742 deletions.
diff --git a/.gitignore b/.gitignore
@@ -188,3 +188,6 @@ cabal.project.local
 samples/client/petstore/elixir/_build/
 samples/client/petstore/elixir/deps/
 samples/client/petstore/elixir/mix.lock
+
+# groovy
+samples/client/petstore/groovy/build
diff --git a/...enapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java b/...enapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java
@@ -12,9 +12,11 @@ public class GroovyClientCodegen extends AbstractJavaCodegen {
     public GroovyClientCodegen() {
         super();
 
-        // clear import mapping (from default generator) as groovy does not use it
-        // at the moment
-        importMapping.clear();
+        // avoid importing the following as models
+        languageSpecificPrimitives.add("Date");
+        languageSpecificPrimitives.add("ArrayList");
+        languageSpecificPrimitives.add("File");
+        languageSpecificPrimitives.add("Map");
 
         sourceFolder = projectFolder + File.separator + "groovy";
         outputFolder = "generated-code/groovy";
@@ -29,18 +31,17 @@ public GroovyClientCodegen() {
         modelDocTemplateFiles.remove("model_doc.mustache");
         apiDocTemplateFiles.remove("api_doc.mustache");
 
-        apiPackage = "io.swagger.api";
-        modelPackage = "io.swagger.model";
-        configPackage = "io.swagger.configuration";
-        invokerPackage = "io.swagger.api";
-        artifactId = "swagger-groovy";
+        apiPackage = "org.openapitools.api";
+        modelPackage = "org.openapitools.model";
+        configPackage = "org.openapitools.configuration";
+        invokerPackage = "org.openapitools.api";
+        artifactId = "openapi-groovy";
         dateLibrary = "legacy"; //TODO: add joda support to groovy
 
         additionalProperties.put("title", title);
         additionalProperties.put(CONFIG_PACKAGE, configPackage);
 
         cliOptions.add(new CliOption(CONFIG_PACKAGE, "configuration package for generated code"));
-
     }
 
     @Override

diff --git a/modules/openapi-generator/src/main/resources/Groovy/model.mustache b/modules/openapi-generator/src/main/resources/Groovy/model.mustache
@@ -18,4 +18,4 @@ class {{classname}} {
     {{/vars}}
 }
 {{/model}}
-{{/models}}
+{{/models}}
diff --git a/samples/client/petstore/groovy/.openapi-generator/VERSION b/samples/client/petstore/groovy/.openapi-generator/VERSION
@@ -1 +1 @@
-2.2.3-SNAPSHOT
+3.0.0-SNAPSHOT
diff --git a/...ain/groovy/io/swagger/api/ApiUtils.groovy → ...oovy/org/openapitools/api/ApiUtils.groovy b/...ain/groovy/io/swagger/api/ApiUtils.groovy → ...oovy/org/openapitools/api/ApiUtils.groovy
@@ -1,4 +1,4 @@
-package io.swagger.api;
+package org.openapitools.api;
 
 import groovyx.net.http.HTTPBuilder
 import groovyx.net.http.Method

diff --git a/.../main/groovy/io/swagger/api/PetApi.groovy → ...groovy/org/openapitools/api/PetApi.groovy b/.../main/groovy/io/swagger/api/PetApi.groovy → ...groovy/org/openapitools/api/PetApi.groovy
@@ -1,13 +1,12 @@
-package io.swagger.api;
+package org.openapitools.api;
 
 import groovyx.net.http.*
 import static groovyx.net.http.ContentType.*
 import static groovyx.net.http.Method.*
-import io.swagger.api.ApiUtils
+import org.openapitools.api.ApiUtils
 
-import io.swagger.model.File
-import io.swagger.model.ModelApiResponse
-import io.swagger.model.Pet
+import org.openapitools.model.ModelApiResponse
+import org.openapitools.model.Pet
 
 import java.util.*;
 

diff --git a/...ain/groovy/io/swagger/api/StoreApi.groovy → ...oovy/org/openapitools/api/StoreApi.groovy b/...ain/groovy/io/swagger/api/StoreApi.groovy → ...oovy/org/openapitools/api/StoreApi.groovy
@@ -1,12 +1,11 @@
-package io.swagger.api;
+package org.openapitools.api;
 
 import groovyx.net.http.*
 import static groovyx.net.http.ContentType.*
 import static groovyx.net.http.Method.*
-import io.swagger.api.ApiUtils
+import org.openapitools.api.ApiUtils
 
-import io.swagger.model.Map
-import io.swagger.model.Order
+import org.openapitools.model.Order
 
 import java.util.*;
 

diff --git a/...main/groovy/io/swagger/api/UserApi.groovy → ...roovy/org/openapitools/api/UserApi.groovy b/...main/groovy/io/swagger/api/UserApi.groovy → ...roovy/org/openapitools/api/UserApi.groovy
@@ -1,11 +1,11 @@
-package io.swagger.api;
+package org.openapitools.api;
 
 import groovyx.net.http.*
 import static groovyx.net.http.ContentType.*
 import static groovyx.net.http.Method.*
-import io.swagger.api.ApiUtils
+import org.openapitools.api.ApiUtils
 
-import io.swagger.model.User
+import org.openapitools.model.User
 
 import java.util.*;
 

diff --git a/...n/groovy/io/swagger/model/Category.groovy → ...vy/org/openapitools/model/Category.groovy b/...n/groovy/io/swagger/model/Category.groovy → ...vy/org/openapitools/model/Category.groovy
@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import groovy.transform.Canonical
 import io.swagger.annotations.ApiModel;

diff --git a/.../io/swagger/model/ModelApiResponse.groovy → ...penapitools/model/ModelApiResponse.groovy b/.../io/swagger/model/ModelApiResponse.groovy → ...penapitools/model/ModelApiResponse.groovy
@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import groovy.transform.Canonical
 import io.swagger.annotations.ApiModel;

diff --git a/...main/groovy/io/swagger/model/Order.groovy → ...roovy/org/openapitools/model/Order.groovy b/...main/groovy/io/swagger/model/Order.groovy → ...roovy/org/openapitools/model/Order.groovy
@@ -1,9 +1,8 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import groovy.transform.Canonical
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.Date;
 
 @Canonical
 class Order {

diff --git a/...c/main/groovy/io/swagger/model/Pet.groovy → .../groovy/org/openapitools/model/Pet.groovy b/...c/main/groovy/io/swagger/model/Pet.groovy → .../groovy/org/openapitools/model/Pet.groovy
@@ -1,12 +1,12 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import groovy.transform.Canonical
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.ArrayList;
-import io.swagger.model.Category;
-import io.swagger.model.Tag;
+import java.util.ArrayList;
 import java.util.List;
+import org.openapitools.model.Category;
+import org.openapitools.model.Tag;
 
 @Canonical
 class Pet {

diff --git a/...c/main/groovy/io/swagger/model/Tag.groovy → .../groovy/org/openapitools/model/Tag.groovy b/...c/main/groovy/io/swagger/model/Tag.groovy → .../groovy/org/openapitools/model/Tag.groovy
@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import groovy.transform.Canonical
 import io.swagger.annotations.ApiModel;

diff --git a/.../main/groovy/io/swagger/model/User.groovy → ...groovy/org/openapitools/model/User.groovy b/.../main/groovy/io/swagger/model/User.groovy → ...groovy/org/openapitools/model/User.groovy
@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import groovy.transform.Canonical
 import io.swagger.annotations.ApiModel;

diff --git a/samples/client/petstore/groovy/src/main/java/io/swagger/api/ApiUtils.groovy b/samples/client/petstore/groovy/src/main/java/io/swagger/api/ApiUtils.groovy