add back groovy code generator

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GroovyClientCodegen.java

@@ -0,0 +1,93 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.*;
+import io.swagger.models.Operation;
+
+import java.io.File;
+import java.util.*;
+
+public class GroovyClientCodegen extends JavaClientCodegen {
+    public static final String CONFIG_PACKAGE = "configPackage";
+    protected String title = "Petstore Server";
+    protected String configPackage = "";
+    protected String templateFileName = "api.mustache";
+
+    public GroovyClientCodegen() {
+        super();
+
+        sourceFolder = projectFolder + File.separator + "groovy";
+        outputFolder = "generated-code/groovy";
+        modelTemplateFiles.put("model.mustache", ".groovy");
+        apiTemplateFiles.put(templateFileName, ".groovy");
+        embeddedTemplateDir = templateDir = "Groovy";
+        
+        apiPackage = "io.swagger.api";
+        modelPackage = "io.swagger.model";
+        configPackage = "io.swagger.configuration";
+        invokerPackage = "io.swagger.api";
+        artifactId = "swagger-spring-mvc-server";
+
+        additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
+        additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion);
+        additionalProperties.put("title", title);
+        additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage);
+        additionalProperties.put(CONFIG_PACKAGE, configPackage);
+
+        cliOptions.add(new CliOption(CONFIG_PACKAGE, "configuration package for generated code"));
+
+        supportedLibraries.clear();
+    }
+
+    @Override
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    @Override
+    public String getName() {
+        return "groovy";
+    }
+
+    @Override
+    public String getHelp() {
+        return "Generates a Groovy API client (beta).";
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        // clear model and api doc template as this codegen
+        // does not support auto-generated markdown doc at the moment
+        modelDocTemplateFiles.remove("model_doc.mustache");
+        apiDocTemplateFiles.remove("api_doc.mustache");
+
+        if (additionalProperties.containsKey(CONFIG_PACKAGE)) {
+            this.setConfigPackage((String) additionalProperties.get(CONFIG_PACKAGE));
+        }
+
+        supportingFiles.clear();
+        supportingFiles.add(new SupportingFile("build.gradle.mustache", "", "build.gradle"));
+        // TODO readme to be added later
+        //supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+        supportingFiles.add(new SupportingFile("ApiUtils.mustache",
+                (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiUtils.groovy"));
+
+    }
+
+    @Override
+    public String toApiName(String name) {
+        if (name.length() == 0) {
+            return "DefaultApi";
+        }
+        name = sanitizeName(name);
+        return camelize(name) + "Api";
+    }
+
+    public void setConfigPackage(String configPackage) {
+        this.configPackage = configPackage;
+    }
+
+}

modules/swagger-codegen/src/main/resources/Groovy/api.mustache

@@ -1,14 +1,9 @@
 package {{package}};
 
-
-
-
-
 import groovyx.net.http.*
 import static groovyx.net.http.ContentType.*
 import static groovyx.net.http.Method.*
 import {{invokerPackage}}.ApiUtils
-//-------------
 
 {{#imports}}import {{import}}
 {{/imports}}
@@ -21,36 +16,37 @@ class {{classname}} {
     String basePath = "{{basePath}}"
     String versionPath = "/api/v1"
 
+    {{#operation}}
+    def {{operationId}} ({{#allParams}} {{{dataType}}} {{paramName}},{{/allParams}} Closure onSuccess, Closure onFailure)  {
+        // create path and map variables
+        String resourcePath = "{{path}}"
 
-  {{#operation}}
-  def {{nickname}} ({{#allParams}} {{{dataType}}} {{paramName}},{{/allParams}} Closure onSuccess, Closure onFailure)  {
-    // create path and map variables
-    String resourcePath = "{{path}}"
+        // query params
+        def queryParams = [:]
+        def headerParams = [:]
+    
+        {{#allParams}}
+        {{#required}}
+        // verify required params are set
+        if ({{paramName}} == null) {
+            throw new RuntimeException("missing required params {{paramName}}")
+        }
+        {{/required}}
+        {{/allParams}}
 
+        {{#queryParams}}if (!"null".equals(String.valueOf({{paramName}})))
+            queryParams.put("{{paramName}}", String.valueOf({{paramName}}))
+        {{/queryParams}}
 
-    // query params
-    def queryParams = [:]
-    def headerParams = [:]
+        {{#headerParams}}
+        headerParams.put("{{paramName}}", {{paramName}})
+        {{/headerParams}}
 
-    {{#allParams}}
-    // verify required params are set
-    if({{/allParams}}{{#required}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/required}}{{#allParams}}) {
-       throw new RuntimeException("missing required params")
-    }
-    {{/allParams}}
-
-    {{#queryParams}}if(!"null".equals(String.valueOf({{paramName}})))
-      queryParams.put("{{paramName}}", String.valueOf({{paramName}}))
-    {{/queryParams}}
-
-    {{#headerParams}}headerParams.put("{{paramName}}", {{paramName}})
-    {{/headerParams}}
-
-    invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams,
+        invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams,
                     "{{httpMethod}}", "{{returnContainer}}",
                     {{#returnBaseType}}{{{returnBaseType}}}.class {{/returnBaseType}}{{^returnBaseType}}null {{/returnBaseType}})
-
-  }
-  {{/operation}}
+                    
+    }
+    {{/operation}}
 }
 {{/operations}}

modules/swagger-codegen/src/main/resources/Groovy/build.gradle.mustache

@@ -17,15 +17,26 @@ buildscript {
 }
 
 repositories {
-  mavenCentral()
-  mavenLocal()
-  mavenCentral(artifactUrls: ['http://maven.springframework.org/milestone'])
-  maven { url  "http://$artifactory:8080/artifactory/repo" }
+    mavenCentral()
+    mavenLocal()
+    mavenCentral(artifactUrls: ['http://maven.springframework.org/milestone'])
+    maven { url  "http://$artifactory:8080/artifactory/repo" }
+}
+
+ext {
+    swagger_annotations_version = "1.5.8"
+    jackson_version = "2.7.0"
 }
 
 dependencies {
-    groovy "org.codehaus.groovy:groovy-all:2.0.5"
-    compile 'org.codehaus.groovy.modules.http-builder:http-builder:0.6'
+    compile 'org.codehaus.groovy:groovy-all:2.4.6'
+    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
+    compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
+    compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.1.5"
+    compile 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1'
 }
 
 task wrapper(type: Wrapper) { gradleVersion = '1.6' }

modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig

@@ -6,6 +6,7 @@ io.swagger.codegen.languages.DartClientCodegen
 io.swagger.codegen.languages.FlashClientCodegen
 io.swagger.codegen.languages.FlaskConnexionCodegen
 io.swagger.codegen.languages.GoClientCodegen
+io.swagger.codegen.languages.GroovyClientCodegen
 io.swagger.codegen.languages.JavaClientCodegen
 io.swagger.codegen.languages.JavaJerseyServerCodegen
 io.swagger.codegen.languages.JavaCXFServerCodegen
@@ -41,4 +42,4 @@ io.swagger.codegen.languages.AkkaScalaClientCodegen
 io.swagger.codegen.languages.CsharpDotNet2ClientCodegen
 io.swagger.codegen.languages.ClojureClientCodegen
 io.swagger.codegen.languages.HaskellServantCodegen
-io.swagger.codegen.languages.LumenServerCodegen
+io.swagger.codegen.languages.LumenServerCodegen