Merge pull request #451 from swagger-api/develop_2.0

Merged from develop_2.0

Author: fehguy

README.md

@@ -18,7 +18,7 @@ The Swagger Specification has undergone 3 revisions since initial creation in 20
 
 Swagger Codegen Version | Release Date | Swagger Spec compatability | Notes
 ----------------------- | ------------ | -------------------------- | -----
-2.1.1-M1                | 2015-02-17   | 1.0, 1.1, 1.2, 2.0   | [tag v2.1.0-M1](https://github.com/swagger-api/swagger-codegen/tree/v2.1.0-M1)
+2.1.2-M1                | 2015-02-23   | 1.0, 1.1, 1.2, 2.0   | [tag v2.1.0-M1](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)
 

bin/Version.scala

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+root=./modules/swagger-codegen-distribution/pom.xml
+
+# gets version of swagger-codegen
+version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
+
+executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l async-scala -o samples/client/petstore/async-scala"
+
+java $JAVA_OPTS -jar $executable $ags

bin/scala-async-petstore.sh

@@ -2,15 +2,15 @@
   <parent>
     <groupId>com.wordnik</groupId>
     <artifactId>swagger-codegen-project</artifactId>
-    <version>2.1.1-M1</version>
+    <version>2.1.2-M1</version>
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wordnik</groupId>
   <artifactId>swagger-codegen-distribution</artifactId>
   <packaging>jar</packaging>
   <name>swagger-codegen (executable)</name>
-  <version>2.1.1-M1</version>
+  <version>2.1.2-M1</version>
   <build>
     <testSourceDirectory>src/test/scala</testSourceDirectory>
     <outputDirectory>target/classes</outputDirectory>

modules/swagger-codegen-distribution/pom.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration> 
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <layout class="ch.qos.logback.classic.PatternLayout">
+      <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
+    </layout>
+  </appender>
+  <logger name="com.wordnik" level="debug"/>
+  <root level="error">
+    <appender-ref ref="STDOUT" />
+  </root>
+</configuration>

modules/swagger-codegen-distribution/src/main/resources/logback.xml

@@ -2,15 +2,15 @@
   <parent>
     <groupId>com.wordnik</groupId>
     <artifactId>swagger-codegen-project</artifactId>
-    <version>2.1.1-M1</version>
+    <version>2.1.2-M1</version>
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wordnik</groupId>
   <artifactId>swagger-codegen</artifactId>
   <packaging>jar</packaging>
   <name>swagger-codegen (core library)</name>
-  <version>2.1.1-M1</version>
+  <version>2.1.2-M1</version>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <defaultGoal>install</defaultGoal>

modules/swagger-codegen/pom.xml

@@ -84,7 +84,7 @@ public static void main(String[] args) {
         return;
       }
       if (cmd.hasOption("i"))
-        swagger = new SwaggerParser().read(cmd.getOptionValue("i"), clientOptInput.getAuthorizationValues());
+        swagger = new SwaggerParser().read(cmd.getOptionValue("i"), clientOptInput.getAuthorizationValues(), true);
       if (cmd.hasOption("t"))
         clientOpts.getProperties().put("templateDir", String.valueOf(cmd.getOptionValue("t")));
     }

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/Codegen.java

@@ -18,6 +18,7 @@ public interface CodegenConfig {
   String modelFileFolder();
   String modelPackage();
   String toApiName(String name);
+  String toApiVarName(String name);
   String toModelName(String name);
   String toParamName(String name);
   String escapeReservedWord(String name);

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenConfig.java

@@ -11,6 +11,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.*;
+import java.io.File;
 
 public class DefaultCodegen {
   Logger LOGGER = LoggerFactory.getLogger(DefaultCodegen.class);
@@ -101,11 +102,11 @@ public Map<String, String> modelTemplateFiles() {
   }
 
   public String apiFileFolder() {
-    return outputFolder + "/" + apiPackage().replaceAll("\\.", "/");
+    return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
   }
 
   public String modelFileFolder() {
-    return outputFolder + "/" + modelPackage().replaceAll("\\.", "/");
+    return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
   }
 
   public Map<String, Object> additionalProperties() {
@@ -133,6 +134,10 @@ public String toApiFilename(String name) {
     return initialCaps(name) + "Api";
   }
 
+  public String toApiVarName(String name) {
+    return snakeCase(name);
+  }
+
   public String toModelFilename(String name) {
     return name;
   }
@@ -306,6 +311,10 @@ else if (p instanceof RefProperty) {
     return datatype;
   }
 
+  public String snakeCase(String name) {
+    return Character.toLowerCase(name.charAt(0)) + name.substring(1);
+  }
+
   public String initialCaps(String name) {
     return Character.toUpperCase(name.charAt(0)) + name.substring(1);
   }

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java

@@ -114,6 +114,7 @@ public Reader getTemplate (String name) {
         operation.put("modelPackage", config.modelPackage());
         operation.putAll(config.additionalProperties());
         operation.put("classname", config.toApiName(tag));
+        operation.put("classVarName", config.toApiVarName(tag));
         allOperations.add(operation);
         for(String templateName : config.apiTemplateFiles().keySet()) {
           String suffix = config.apiTemplateFiles().get(templateName);
@@ -153,7 +154,7 @@ public Reader getTemplate (String name) {
       }
       bundle.put("apiInfo", apis);
       bundle.put("models", allModels);
-      bundle.put("apiFolder", config.apiPackage().replaceAll("\\.", "/"));
+      bundle.put("apiFolder", config.apiPackage().replace('.', File.separatorChar));
       bundle.put("modelPackage", config.modelPackage());
       if (swagger.getExternalDocs() != null) {
         bundle.put("externalDocs", swagger.getExternalDocs());