Merge branch 'develop_2.0' into develop_2.0_objc_contenttype

Conflicts:
	samples/client/petstore/objc/client/SWGPetApi.m

Author: geekerzp

.gitignore

@@ -22,7 +22,17 @@ samples/server-generator/scalatra/output
 samples/server-generator/node/output/node_modules
 samples/server-generator/scalatra/target
 samples/server-generator/scalatra/output/.history
-
+samples/client/petstore/qt5cpp/PetStore/moc_*
+samples/client/petstore/qt5cpp/PetStore/*.o
+samples/client/petstore/objc/PetstoreClient.xcworkspace/xcuserdata
+samples/client/petstore/qt5cpp/build-*
+samples/client/petstore/qt5cpp/PetStore/PetStore
+samples/client/petstore/qt5cpp/PetStore/Makefile
+samples/client/petstore/java/hello.txt
+samples/client/petstore/android-java/hello.txt
+samples/client/petstore/objc/Build
+samples/client/petstore/objc/Pods
+samples/server/petstore/nodejs/node_modules
 target
 .idea
 .lib

README.md

@@ -150,8 +150,11 @@ JavaClientCodegen.java
 JaxRSServerCodegen.java
 NodeJSServerCodegen.java
 ObjcClientCodegen.java
+PerlClientCodegen.java
 PhpClientCodegen.java
+Python3ClientCodegen.java
 PythonClientCodegen.java
+Qt5CPPGenerator.java
 RubyClientCodegen.java
 ScalaClientCodegen.java
 ScalatraServerCodegen.java

bin/jaxrs-petstore-server.sh

@@ -26,6 +26,6 @@ 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="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l jaxrs -o samples/server/petstore/jaxrs"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l jaxrs -o samples/server/petstore/jaxrs -Dswagger.codegen.jaxrs.impl.source=src/main/java"
 
 java $JAVA_OPTS -jar $executable $ags

modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Generate.java

@@ -54,10 +54,16 @@ public class Generate implements Runnable {
                     "Pass in a URL-encoded string of name:header with a comma separating multiple values")
     private String auth;
 
+    @Option( name= {"-D"}, title = "system properties", description = "sets specified system properties in " +
+            "the format of name=value,name=value")
+    private String systemProperties;
+
     @Override
     public void run() {
         verbosed(verbose);
 
+        setSystemProperties();
+
         ClientOptInput input = new ClientOptInput();
 
         if (isNotEmpty(auth)) {
@@ -77,6 +83,17 @@ public void run() {
         new DefaultGenerator().opts(input.opts(new ClientOpts()).swagger(swagger)).generate();
     }
 
+    private void setSystemProperties() {
+        if( systemProperties != null && systemProperties.length() > 0 ){
+            for( String property : systemProperties.split(",")) {
+                int ix = property.indexOf('=');
+                if( ix > 0 && ix < property.length()-1 ){
+                    System.setProperty( property.substring(0, ix), property.substring(ix+1) );
+                }
+            }
+        }
+    }
+
     /**
      * If true parameter, adds system properties which enables debug mode in generator
      * @param verbose - if true, enables debug mode

modules/swagger-codegen/pom.xml

@@ -6,11 +6,9 @@
     <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-M2-SNAPSHOT</version>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <defaultGoal>install</defaultGoal>

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

@@ -56,4 +56,8 @@ public interface CodegenConfig {
   Map<String, Object> postProcessModels(Map<String, Object> objs);
   Map<String, Object> postProcessOperations(Map<String, Object> objs);
   Map<String, Object> postProcessSupportingFileData(Map<String, Object> objs);
+
+  String apiFilename(String templateName, String tag);
+
+  boolean shouldOverwrite(String filename);
 }

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

@@ -11,6 +11,6 @@ public class CodegenModel {
   public String defaultValue;
   public List<CodegenProperty> vars = new ArrayList<CodegenProperty>();
   public Set<String> imports = new HashSet<String>();
-  public Boolean hasVars, emptyVars, hasMoreModels;
+  public Boolean hasVars, emptyVars, hasMoreModels, hasEnums;
   public ExternalDocs externalDocs;
 }

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

@@ -3,7 +3,7 @@
 public class CodegenParameter {
   public Boolean isFormParam, isQueryParam, isPathParam, isHeaderParam,
     isCookieParam, isBodyParam, isFile, notFile, hasMore, isContainer, secondaryParam;
-  public String baseName, paramName, dataType, collectionFormat, description, baseType;
+  public String baseName, paramName, dataType, collectionFormat, description, baseType, defaultValue;
   public String jsonSchema;
 
   /**
@@ -34,7 +34,8 @@ public CodegenParameter copy() {
     output.isBodyParam = this.isBodyParam;
     output.required = this.required;
     output.jsonSchema = this.jsonSchema;
+    output.defaultValue = this.defaultValue;
 
     return output;
   }
-}
+}

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

@@ -16,7 +16,10 @@ public class CodegenProperty {
   public String example;
 
   public String jsonSchema;
-  public Double minimum, maximum, exclusiveMinimum, exclusiveMaximum;
+  public Double minimum;
+  public Double maximum;
+  public Boolean exclusiveMinimum;
+  public Boolean exclusiveMaximum;
   public Boolean hasMore = null, required = null, secondaryParam = null;
   public Boolean isPrimitiveType, isContainer, isNotContainer;
   public boolean isEnum;

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

@@ -1,17 +1,21 @@
 package com.wordnik.swagger.codegen;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 public class CodegenResponse {
   public String code, message;
   public Boolean hasMore;
-  public List<Map<String, String>> examples;
+  public List<Map<String, Object>> examples;
   public final List<CodegenProperty> headers = new ArrayList<CodegenProperty>();
   public String dataType, baseType, containerType;
+  public Boolean isDefault;
   public Boolean simpleType;
   public Boolean primitiveType;
   public Boolean isMapContainer;
   public Boolean isListContainer;
   public Object schema;
   public String jsonSchema;
-}
+  public boolean isWildcard() { return "0".equals(code) || "default".equals(code); }
+}