Merge pull request #847 from wing328/fix_indentation

Fix indentation

Author: fehguy

README.md

@@ -5,20 +5,15 @@
 ## Overview
 This is the swagger codegen project, which allows generation of client libraries automatically from a Swagger-compliant server.  
 
-## What's Swagger?
-
-The goal of Swagger™ is to define a standard, language-agnostic interface to REST APIs which allows both humans and computers to discover and understand the capabilities of the service without access to source code, documentation, or through network traffic inspection. When properly defined via Swagger, a consumer can understand and interact with the remote service with a minimal amount of implementation logic. Similar to what interfaces have done for lower-level programming, Swagger removes the guesswork in calling the service.
-
-
 Check out [Swagger-Spec](https://github.com/swagger-api/swagger-spec) for additional information about the Swagger project, including additional libraries with support for other languages and more. 
 
 
-## Compatability
+## Compatibility
 The Swagger Specification has undergone 3 revisions since initial creation in 2010.  The swagger-codegen project has the following compatibilies with the swagger specification:
 
 Swagger Codegen Version | Release Date | Swagger Spec compatibility | Notes
 ----------------------- | ------------ | -------------------------- | -----
-2.1.0                | 2015-06-09   | 1.0, 1.1, 1.2, 2.0   | [master](https://github.com/swagger-api/swagger-codegen)
+2.1.0                   | 2015-06-09   | 1.0, 1.1, 1.2, 2.0   | [master](https://github.com/swagger-api/swagger-codegen)
 2.0.17                  | 2014-08-22   | 1.1, 1.2      | [tag v2.0.17](https://github.com/swagger-api/swagger-codegen/tree/v2.0.17)
 1.0.4                   | 2012-04-12   | 1.0, 1.1      | [tag v1.0.4](https://github.com/swagger-api/swagger-codegen/tree/swagger-codegen_2.9.1-1.1)
 
@@ -29,6 +24,17 @@ You need the following installed and available in your $PATH:
 * [Java 7](http://java.oracle.com)
 
 * [Apache maven 3.0.3 or greater](http://maven.apache.org/)
+ 
+#### OS X Users
+Don't forget to install Java 7. You probably have 1.6 or 1.8.
+
+Export JAVA_HOME in order to user proper Java version:
+```
+export JAVA_HOME=`/usr/libexec/java_home -v 1.7`
+export PATH=${JAVA_HOME}/bin:$PATH
+```
+
+#### Building
 
 After cloning the project, you can build it from source with this command:
 

bin/all-petstore.sh

@@ -25,6 +25,7 @@ cd $APP_DIR
 ./bin/jaxrs-petstore-server.sh
 ./bin/java-petstore.sh
 ./bin/qt5-petstore.sh
+./bin/perl-petstore.sh
 ./bin/php-petstore.sh
 ./bin/python-petstore.sh
 ./bin/retrofit-petstore.sh

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

@@ -8,43 +8,43 @@ import static java.net.URI.create;
 
 class ApiUtils {
 
-def invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, method, container, type)  {
-def (url, uriPath) = buildUrlAndUriPath(basePath, versionPath, resourcePath)
-println "url=$url uriPath=$uriPath"
-def http = new HTTPBuilder(url)
-http.request( Method.valueOf(method), JSON ) {
-uri.path = uriPath
-uri.query = queryParams
-response.success = { resp, json ->
-if (type != null) {
-onSuccess(parse(json, container, type))
-}
-}
-response.failure = { resp ->
-onFailure(resp.status, resp.statusLine.reasonPhrase)
-}
-}
-}
-
-
-def buildUrlAndUriPath(basePath, versionPath, resourcePath) {
-// HTTPBuilder expects to get as its constructor parameter an URL,
-// without any other additions like path, therefore we need to cut the path
-// from the basePath as it is represented by swagger APIs
-// we use java.net.URI to manipulate the basePath
-// then the uriPath will hold the rest of the path
-URI baseUri =  create(basePath)
-def pathOnly = baseUri.getPath()
-[basePath-pathOnly, pathOnly+versionPath+resourcePath]
-}
-
-
-def parse(object, container, clazz) {
-if (container == "List") {
-return object.collect {parse(it, "", clazz)}
-}   else {
-return clazz.newInstance(object)
-}
-}
+    def invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, method, container, type)  {
+        def (url, uriPath) = buildUrlAndUriPath(basePath, versionPath, resourcePath)
+        println "url=$url uriPath=$uriPath"
+        def http = new HTTPBuilder(url)
+        http.request( Method.valueOf(method), JSON ) {
+            uri.path = uriPath
+            uri.query = queryParams
+            response.success = { resp, json ->
+                if (type != null) {
+                    onSuccess(parse(json, container, type))
+                }
+            }
+            response.failure = { resp ->
+                onFailure(resp.status, resp.statusLine.reasonPhrase)
+            }
+        }
+    }
+
+
+    def buildUrlAndUriPath(basePath, versionPath, resourcePath) {
+        // HTTPBuilder expects to get as its constructor parameter an URL,
+        // without any other additions like path, therefore we need to cut the path
+        // from the basePath as it is represented by swagger APIs
+        // we use java.net.URI to manipulate the basePath
+        // then the uriPath will hold the rest of the path
+        URI baseUri =  create(basePath)
+        def pathOnly = baseUri.getPath()
+        [basePath-pathOnly, pathOnly+versionPath+resourcePath]
+    }
+
+
+    def parse(object, container, clazz) {
+        if (container == "List") {
+            return object.collect {parse(it, "", clazz)}
+        }   else {
+                return clazz.newInstance(object)
+        }
+    }
 
 }

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

@@ -1,6 +1,9 @@
 package {{package}};
 
 
+
+
+
 import groovyx.net.http.*
 import static groovyx.net.http.ContentType.*
 import static groovyx.net.http.Method.*
@@ -14,40 +17,40 @@ import java.util.*;
 
 @Mixin(ApiUtils)
 {{#operations}}
-    class {{classname}} {
+class {{classname}} {
     String basePath = "{{basePath}}"
     String versionPath = "/api/v1"
 
 
-    {{#operation}}
-        def {{nickname}} ({{#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 = [:]
+    // query params
+    def queryParams = [:]
+    def headerParams = [:]
 
-        {{#requiredParamCount}}
-            // verify required params are set
-            if({{/requiredParamCount}}{{#requiredParams}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) {
-        throw new RuntimeException("missing required params")
-        }
-        {{/requiredParamCount}}
+    {{#requiredParamCount}}
+    // verify required params are set
+    if({{/requiredParamCount}}{{#requiredParams}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) {
+       throw new RuntimeException("missing required params")
+    }
+    {{/requiredParamCount}}
 
-        {{#queryParams}}if(!"null".equals(String.valueOf({{paramName}})))
-        queryParams.put("{{paramName}}", String.valueOf({{paramName}}))
-        {{/queryParams}}
+    {{#queryParams}}if(!"null".equals(String.valueOf({{paramName}})))
+      queryParams.put("{{paramName}}", String.valueOf({{paramName}}))
+    {{/queryParams}}
 
-        {{#headerParams}}headerParams.put("{{paramName}}", {{paramName}})
-        {{/headerParams}}
+    {{#headerParams}}headerParams.put("{{paramName}}", {{paramName}})
+    {{/headerParams}}
 
-        invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams,
-        "{{httpMethod}}", "{{returnContainer}}",
-        {{#returnBaseType}}{{{returnBaseType}}}.class {{/returnBaseType}}{{^returnBaseType}}null {{/returnBaseType}})
+    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

@@ -6,24 +6,24 @@ archivesBaseName = 'swagger-gen-groovy'
 version = '0.1'
 
 buildscript {
-repositories {
-maven { url 'http://repo.jfrog.org/artifactory/gradle-plugins' }
-}
-dependencies {
-classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '2.0.16')
-}
+    repositories {
+        maven { url 'http://repo.jfrog.org/artifactory/gradle-plugins' }
+    }
+    dependencies {
+        classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '2.0.16')
+    }
 }
 
 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" }
 }
 
 dependencies {
-groovy "org.codehaus.groovy:groovy-all:2.0.5"
-compile 'org.codehaus.groovy.modules.http-builder:http-builder:0.6'
+    groovy "org.codehaus.groovy:groovy-all:2.0.5"
+    compile 'org.codehaus.groovy.modules.http-builder:http-builder:0.6'
 
 
 }

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

@@ -4,18 +4,18 @@ import groovy.transform.Canonical
 {{#imports}}import {{import}};
 {{/imports}}
 {{#models}}
-    {{#model}}
-        @Canonical
-        class {{classname}} {
-        {{#vars}}
+{{#model}}
+@Canonical
+class {{classname}} {
+  {{#vars}}
 
-            {{#description}}/* {{{description}}} */
-            {{/description}}
-            {{{datatype}}} {{name}} = {{{defaultValue}}}
-        {{/vars}}
+  {{#description}}/* {{{description}}} */
+  {{/description}}
+  {{{datatype}}} {{name}} = {{{defaultValue}}}
+  {{/vars}}
+  
 
+}
 
-        }
-
-    {{/model}}
+{{/model}}
 {{/models}}