Merge branch 'nancyfx-codegen' of https://github.com/FinderSystems/swagger-codegen into FinderSystems-nancyfx-codegen

Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java

Author: wing328

README.md

@@ -461,6 +461,7 @@ JavaJerseyServerCodegen.java
 JavaResteasyServerCodegen.java
 JavascriptClientCodegen.java
 NodeJSServerCodegen.java
+NancyFXServerCodegen
 ObjcClientCodegen.java
 PerlClientCodegen.java
 PhpClientCodegen.java
@@ -698,6 +699,7 @@ Here are some companies/projects using Swagger Codegen in production. To add you
 - [eureka](http://eure.jp/)
 - [everystory.us](http://everystory.us)
 - [Expected Behavior](http://www.expectedbehavior.com/)
+- [Finder](http://en.finder.pl/)
 - [FH Münster - University of Applied Sciences](http://www.fh-muenster.de)
 - [GraphHopper](https://graphhopper.com/)
 - [Gravitate Solutions](http://gravitatesolutions.com/)
@@ -767,6 +769,7 @@ Swaagger Codegen core team members are contributors who have been making signfic
 | Java Spring Boot |  |
 | Java SpringMVC | @kolyjjj (2016/05/01) |
 | Java JAX-RS |  |
+| NancyFX |  |
 | NodeJS | @kolyjjj (2016/05/01) |  
 | PHP Lumen | @abcsum (2016/05/01) |
 | PHP Silex |  |

bin/windows/nancyfx-petstore-server.bat

@@ -0,0 +1,10 @@
+set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -t modules\swagger-codegen\src\main\resources\nancyfx -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l nancyfx -o samples\server\petstore\nancyfx\
+
+java %JAVA_OPTS% -jar %executable% %ags%

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java

@@ -5,6 +5,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.Objects;
 
 import io.swagger.models.ExternalDocs;
 
@@ -29,14 +30,15 @@ public class CodegenModel {
     public List<CodegenProperty> readOnlyVars = new ArrayList<CodegenProperty>(); // a list of read-only properties
     public List<CodegenProperty> readWriteVars = new ArrayList<CodegenProperty>(); // a list of properties for read, write
     public List<CodegenProperty> allVars;
+    public List<CodegenProperty> parentVars = new ArrayList<>();
     public Map<String, Object> allowableValues;
 
     // Sorted sets of required parameters.
     public Set<String> mandatory = new TreeSet<String>();
     public Set<String> allMandatory;
 
     public Set<String> imports = new TreeSet<String>();
-    public Boolean hasVars, emptyVars, hasMoreModels, hasEnums, isEnum, hasRequired, isArrayModel;
+    public Boolean hasVars, emptyVars, hasMoreModels, hasEnums, isEnum, hasRequired, isArrayModel, hasChildren;
     public Boolean hasOnlyReadOnly = true; // true if all properties are read-only
     public ExternalDocs externalDocs;
 
@@ -122,6 +124,12 @@ public boolean equals(Object o) {
             return false;
         if (externalDocs != null ? !externalDocs.equals(that.externalDocs) : that.externalDocs != null)
             return false;
+        if (!Objects.equals(hasOnlyReadOnly, that.hasOnlyReadOnly))
+            return false;
+        if (!Objects.equals(hasChildren, that.hasChildren))
+            return false;
+        if (!Objects.equals(parentVars, that.parentVars))
+            return false;
         return vendorExtensions != null ? vendorExtensions.equals(that.vendorExtensions) : that.vendorExtensions == null;
 
     }
@@ -158,6 +166,9 @@ public int hashCode() {
         result = 31 * result + (isEnum != null ? isEnum.hashCode() : 0);
         result = 31 * result + (externalDocs != null ? externalDocs.hashCode() : 0);
         result = 31 * result + (vendorExtensions != null ? vendorExtensions.hashCode() : 0);
+        result = 31 * result + Objects.hash(hasOnlyReadOnly);
+        result = 31 * result + Objects.hash(hasChildren);
+        result = 31 * result + Objects.hash(parentVars);
         return result;
     }
 }

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java

@@ -2,8 +2,9 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
-public class CodegenProperty {
+public class CodegenProperty implements Cloneable {
     public String baseName, complexType, getter, setter, description, datatype, datatypeWithEnum,
             name, min, max, defaultValue, defaultValueWithParam, baseType, containerType;
 
@@ -43,6 +44,7 @@ public class CodegenProperty {
     public CodegenProperty items;
     public Map<String, Object> vendorExtensions;
     public Boolean hasValidation; // true if pattern, maximum, etc are set (only used in the mustache template)
+    public Boolean isInherited;
 
     @Override
     public String toString() {
@@ -105,6 +107,7 @@ public int hashCode()
         result = prime * result + ((isDateTime == null) ? 0 : isDateTime.hashCode());
         result = prime * result + ((isMapContainer == null) ? 0 : isMapContainer.hashCode());
         result = prime * result + ((isListContainer == null) ? 0 : isListContainer.hashCode());
+        result = prime * result + Objects.hashCode(isInherited);
         return result;
     }
 
@@ -256,6 +259,18 @@ public boolean equals(Object obj) {
         if (this.isMapContainer != other.isMapContainer && (this.isMapContainer == null || !this.isMapContainer.equals(other.isMapContainer))) {
             return false;
         }
+        if (!Objects.equals(this.isInherited, other.isInherited)) {
+            return false;
+        }
         return true;
     }
+
+    @Override
+    public CodegenProperty clone() {
+        try {
+            return (CodegenProperty) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException(e);
+        }
+    }
 }