Samples regenerated

[v2] Restructures endpoint data (#35)

* Restructures endpoint data, modules written for responses

* Endpoint docs improved, not done yet

* Updates header_params

* Updates path_parameters

* Updates cookie_params, updates x_params to say key + input type

* Samples updated

* Fixes DefaultCodegenTests

v2.0.0 adds request_body module (#46)

* Java and template updates for separate request body module

* Samples updated

* Samples regenerated

V2.0.0 adds parameter modules, response packages, and response header modules (#47)

* Adds parameter template and code to write it

* Writes module for each parameter

* Removes prependFormOrBodyParameters

* Sample regenrated

* Samples regenerated

* Fixes readme example

* simplifies setting items and additional_properties var names

* Regenerates sample with fixed schema names

* Samples regenerated

* Fixes java docstirng typo

* Fixes JavaModelTest tests

* Fixes tests in JavaModelEnumTest

* FIxes tests in JavaClientCodegenTest

* FIxes tests in DefaultGeneratorTest

* FIxes tests in DefaultCodegenTest

* Adds HeaderParameterWithoutName to api_client

* Sample regenerated, responses are now modules

* Moves request body schemas to the root indentation level of the response modules

* Adds code to generate response header modules

* Updates fromParameter

* Sample updated, fixed bug where form param was not seen as body

* Samples regenerated

* Fixes java tests

2.0.0, moves models into components.schema package (#51)

* python client modelPackage updated

* Fixes links in model_doc template

* Samples updated and python client path methods updated

* Models sucessfully moved into components/schema in one sample

* Replaces model import with components.schema

* Fixes readme imports

* Fixes model doc links from endpoint docs

* Samples regenerated

* Fixes manual test model imports

* Samples regenerated, added init for test components

* Removes model models folders

Changes complexType to refClass (#52)

Author: spacether

docs/new-generator.md

@@ -309,10 +309,10 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 {{#parent}}
 {{#parentVars}}
-**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{refClass}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
 {{/parentVars}}
 {{/parent}}
-{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{refClass}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
 {{/vars}}
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

docs/templating.md

@@ -807,7 +807,7 @@ Supporting files can either be processed through the templating engine or copied
 
 > This is a very limited list of variable name explanations. Feel free to [open a pull request](https://github.com/OpenAPITools/openapi-generator/pull/new/master) to add to this documentation!
 
-- **complexType**: stores the name of the model (e.g. Pet)
+- **refClass**: stores the name of the model (e.g. Pet)
 - **isContainer**: true if the parameter or property is an array or a map.
 - **isPrimitiveType**: true if the parameter or property type is a primitive type (e.g. string, integer, etc) as defined in the spec.
 

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java

@@ -26,7 +26,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti
      */
     public String openApiType;
     public String baseName;
-    public String complexType;
+    public String refClass;
     public String getter;
     public String setter;
     /**
@@ -258,12 +258,12 @@ public void setBaseName(String baseName) {
         this.baseName = baseName;
     }
 
-    public String getComplexType() {
-        return complexType;
+    public String getRefClass() {
+        return refClass;
     }
 
-    public void setComplexType(String complexType) {
-        this.complexType = complexType;
+    public void setRefClass(String refClass) {
+        this.refClass = refClass;
     }
 
     public String getGetter() {
@@ -978,7 +978,7 @@ public String toString() {
         final StringBuilder sb = new StringBuilder("CodegenProperty{");
         sb.append("openApiType='").append(openApiType).append('\'');
         sb.append(", baseName='").append(baseName).append('\'');
-        sb.append(", complexType='").append(complexType).append('\'');
+        sb.append(", refClass='").append(refClass).append('\'');
         sb.append(", getter='").append(getter).append('\'');
         sb.append(", setter='").append(setter).append('\'');
         sb.append(", description='").append(description).append('\'');
@@ -1151,7 +1151,7 @@ public boolean equals(Object o) {
                 Objects.equals(composedSchemas, that.composedSchemas) &&
                 Objects.equals(openApiType, that.openApiType) &&
                 Objects.equals(baseName, that.baseName) &&
-                Objects.equals(complexType, that.complexType) &&
+                Objects.equals(refClass, that.refClass) &&
                 Objects.equals(getter, that.getter) &&
                 Objects.equals(setter, that.setter) &&
                 Objects.equals(description, that.description) &&
@@ -1197,7 +1197,7 @@ public boolean equals(Object o) {
     @Override
     public int hashCode() {
 
-        return Objects.hash(openApiType, baseName, complexType, getter, setter, description,
+        return Objects.hash(openApiType, baseName, refClass, getter, setter, description,
                 dataType, datatypeWithEnum, dataFormat, name, min, max, defaultValue,
                 defaultValueWithParam, baseType, containerType, title, unescapedDescription,
                 maxLength, minLength, pattern, example, jsonSchema, minimum, maximum,

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java

@@ -93,6 +93,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties {
     private Map<String, CodegenProperty> requiredVarsMap;
     private String ref;
     private boolean schemaIsFromAdditionalProperties;
+    public Set<String> imports = new TreeSet<>();
 
     @Override
     public int hashCode() {
@@ -105,7 +106,7 @@ public int hashCode() {
                 getMinLength(), exclusiveMinimum, exclusiveMaximum, getMinimum(), getMaximum(), getPattern(),
                 is1xx, is2xx, is3xx, is4xx, is5xx, additionalPropertiesIsAnyType, hasVars, hasRequired,
                 hasDiscriminatorWithNonEmptyMapping, composedSchemas, hasMultipleTypes, responseHeaders, content,
-                requiredVarsMap, ref, uniqueItemsBoolean, schemaIsFromAdditionalProperties);
+                requiredVarsMap, ref, uniqueItemsBoolean, schemaIsFromAdditionalProperties, imports);
     }
 
     @Override
@@ -155,6 +156,7 @@ public boolean equals(Object o) {
                 getAdditionalPropertiesIsAnyType() == that.getAdditionalPropertiesIsAnyType() &&
                 getHasVars() == that.getHasVars() &&
                 getHasRequired() == that.getHasRequired() &&
+                Objects.equals(imports, that.imports) &&
                 Objects.equals(uniqueItemsBoolean, that.getUniqueItemsBoolean()) &&
                 Objects.equals(ref, that.getRef()) &&
                 Objects.equals(requiredVarsMap, that.getRequiredVarsMap()) &&
@@ -612,6 +614,7 @@ public String toString() {
         sb.append(", requiredVarsMap=").append(requiredVarsMap);
         sb.append(", ref=").append(ref);
         sb.append(", schemaIsFromAdditionalProperties=").append(schemaIsFromAdditionalProperties);
+        sb.append(", imports=").append(imports);
         sb.append('}');
         return sb.toString();
     }