Generate java inflector OAS2 (#222)

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java

@@ -1,9 +1,13 @@
 package org.openapitools.codegen.languages;
 
-import org.openapitools.codegen.*;
+import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.*;
 
 import org.apache.commons.lang3.BooleanUtils;
+import org.openapitools.codegen.CodegenModel;
+import org.openapitools.codegen.CodegenOperation;
+import org.openapitools.codegen.CodegenProperty;
+import org.openapitools.codegen.CodegenType;
+import org.openapitools.codegen.SupportingFile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,7 +29,7 @@ public class JavaInflectorServerCodegen extends AbstractJavaCodegen {
         sourceFolder = "src/gen/java";
         apiTestTemplateFiles.clear(); // TODO: add test template
         embeddedTemplateDir = templateDir = "JavaInflector";
-        invokerPackage = "io.swagger.controllers";
+        invokerPackage = "org.openapitools.controllers";
         artifactId = "openapi-inflector-server";
         dateLibrary = "legacy"; //TODO: add joda support
 
@@ -36,8 +40,8 @@ public class JavaInflectorServerCodegen extends AbstractJavaCodegen {
         apiDocTemplateFiles.remove("api_doc.mustache");
 
 
-        apiPackage = System.getProperty("swagger.codegen.inflector.apipackage", "io.swagger.controllers");
+        apiPackage = System.getProperty("swagger.codegen.inflector.apipackage", "org.openapitools.controllers");
-        modelPackage = System.getProperty("swagger.codegen.inflector.modelpackage", "io.swagger.model");
+        modelPackage = System.getProperty("swagger.codegen.inflector.modelpackage", "org.openapitools.model");
 
         additionalProperties.put("title", title);
         // java inflector uses the jackson lib

samples/server/petstore/java-inflector/.openapi-generator-ignore

@@ -1,11 +1,11 @@
-# Swagger Codegen Ignore
+# OpenAPI Generator Ignore
-# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
 
 # Use this file to prevent files from being overwritten by the generator.
 # The patterns follow closely to .gitignore or .dockerignore.
 
 # As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
 #ApiClient.cs
 
 # You can match any string of characters against a directory, file or extension with a single asterisk (*):

samples/server/petstore/java-inflector/.openapi-generator/VERSION

@@ -1 +1 @@
-2.3.1-SNAPSHOT
+3.0.0-SNAPSHOT

samples/server/petstore/java-inflector/inflector.yaml

@@ -1,40 +1,44 @@
-controllerPackage: io.swagger.controllers
+controllerPackage: org.openapitools.controllers
-modelPackage:  io.swagger.model
+modelPackage:  org.openapitools.model
 swaggerUrl: ./src/main/swagger/swagger.yaml
 modelMappings:
   # to enable explicit mappings, use this syntax:
   DefinitionFromSwaggerSpecification: fully.qualified.path.to.Model
-  AdditionalPropertiesClass : io.swagger.model.AdditionalPropertiesClass
+  AdditionalPropertiesClass : org.openapitools.model.AdditionalPropertiesClass
-Animal : io.swagger.model.Animal
+Animal : org.openapitools.model.Animal
-AnimalFarm : io.swagger.model.AnimalFarm
+AnimalFarm : org.openapitools.model.AnimalFarm
-ArrayOfArrayOfNumberOnly : io.swagger.model.ArrayOfArrayOfNumberOnly
+ArrayOfArrayOfNumberOnly : org.openapitools.model.ArrayOfArrayOfNumberOnly
-ArrayOfNumberOnly : io.swagger.model.ArrayOfNumberOnly
+ArrayOfNumberOnly : org.openapitools.model.ArrayOfNumberOnly
-ArrayTest : io.swagger.model.ArrayTest
+ArrayTest : org.openapitools.model.ArrayTest
-Capitalization : io.swagger.model.Capitalization
+Capitalization : org.openapitools.model.Capitalization
-Cat : io.swagger.model.Cat
+Cat : org.openapitools.model.Cat
-Category : io.swagger.model.Category
+Category : org.openapitools.model.Category
-ClassModel : io.swagger.model.ClassModel
+ClassModel : org.openapitools.model.ClassModel
-Client : io.swagger.model.Client
+Client : org.openapitools.model.Client
-Dog : io.swagger.model.Dog
+Dog : org.openapitools.model.Dog
-EnumArrays : io.swagger.model.EnumArrays
+EnumArrays : org.openapitools.model.EnumArrays
-EnumClass : io.swagger.model.EnumClass
+EnumClass : org.openapitools.model.EnumClass
-EnumTest : io.swagger.model.EnumTest
+EnumTest : org.openapitools.model.EnumTest
-FormatTest : io.swagger.model.FormatTest
+FormatTest : org.openapitools.model.FormatTest
-HasOnlyReadOnly : io.swagger.model.HasOnlyReadOnly
+HasOnlyReadOnly : org.openapitools.model.HasOnlyReadOnly
-MapTest : io.swagger.model.MapTest
+MapTest : org.openapitools.model.MapTest
-MixedPropertiesAndAdditionalPropertiesClass : io.swagger.model.MixedPropertiesAndAdditionalPropertiesClass
+MixedPropertiesAndAdditionalPropertiesClass : org.openapitools.model.MixedPropertiesAndAdditionalPropertiesClass
-Model200Response : io.swagger.model.Model200Response
+Model200Response : org.openapitools.model.Model200Response
-ModelApiResponse : io.swagger.model.ModelApiResponse
+ModelApiResponse : org.openapitools.model.ModelApiResponse
-ModelReturn : io.swagger.model.ModelReturn
+ModelReturn : org.openapitools.model.ModelReturn
-Name : io.swagger.model.Name
+Name : org.openapitools.model.Name
-NumberOnly : io.swagger.model.NumberOnly
+NumberOnly : org.openapitools.model.NumberOnly
-Order : io.swagger.model.Order
+Order : org.openapitools.model.Order
-OuterEnum : io.swagger.model.OuterEnum
+OuterBoolean : org.openapitools.model.OuterBoolean
-Pet : io.swagger.model.Pet
+OuterComposite : org.openapitools.model.OuterComposite
-ReadOnlyFirst : io.swagger.model.ReadOnlyFirst
+OuterEnum : org.openapitools.model.OuterEnum
-SpecialModelName : io.swagger.model.SpecialModelName
+OuterNumber : org.openapitools.model.OuterNumber
-Tag : io.swagger.model.Tag
+OuterString : org.openapitools.model.OuterString
-User : io.swagger.model.User
+Pet : org.openapitools.model.Pet
+ReadOnlyFirst : org.openapitools.model.ReadOnlyFirst
+SpecialModelName : org.openapitools.model.SpecialModelName
+Tag : org.openapitools.model.Tag
+User : org.openapitools.model.User
 
 entityProcessors:
   - json

samples/server/petstore/java-inflector/pom.xml

@@ -1,25 +1,23 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.sonatype.oss</groupId>
         <artifactId>oss-parent</artifactId>
         <version>5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.swagger</groupId>
+    <groupId>org.openapitools</groupId>
-    <artifactId>swagger-inflector-server</artifactId>
+    <artifactId>openapi-inflector-server</artifactId>
     <packaging>jar</packaging>
-    <name>swagger-inflector-server</name>
+    <name>openapi-inflector-server</name>
     <version>1.0.0</version>
-    <prerequisites>
-        <maven>2.2.0</maven>
-    </prerequisites>
 
     <licenses>
-      <license>
+        <license>
-        <name>Unlicense</name>
+            <name>Unlicense</name>
-        <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
-        <distribution>repo</distribution>
+            <distribution>repo</distribution>
-      </license>
+        </license>
     </licenses>
 
     <build>
@@ -27,6 +25,26 @@
         <directory>target</directory>
         <finalName>${project.artifactId}-${project.version}</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>2.2.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -40,7 +58,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>src/gen/java</source>
+                                <source>
+                                src/gen/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -118,6 +137,7 @@
         </repository>
     </repositories>
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <swagger-inflector-version>1.0.14</swagger-inflector-version>
         <jetty-version>9.2.9.v20150224</jetty-version>

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/controllers/StringUtil.java

@@ -1,4 +1,4 @@
-package io.swagger.controllers;
+package org.openapitools.controllers;
 
 
 public class StringUtil {

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Animal.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AnimalFarm.java

@@ -1,9 +1,9 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
-import io.swagger.model.Animal;
 import java.util.ArrayList;
 import java.util.List;
+import org.openapitools.model.Animal;
 
 
 

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayTest.java

@@ -1,13 +1,13 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.ReadOnlyFirst;
 import java.util.ArrayList;
 import java.util.List;
+import org.openapitools.model.ReadOnlyFirst;
 
 
 

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Capitalization.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Cat.java

@@ -1,11 +1,11 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.Animal;
+import org.openapitools.model.Animal;
 
 
 

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Category.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ClassModel.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Client.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Dog.java

@@ -1,11 +1,11 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.Animal;
+import org.openapitools.model.Animal;
 
 
 

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/EnumArrays.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/EnumClass.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonValue;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/EnumTest.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.OuterEnum;
+import org.openapitools.model.OuterEnum;
 
 
 
@@ -50,6 +50,42 @@ public class EnumTest   {
   @JsonProperty("enum_string")
   private EnumStringEnum enumString = null;
 
+  /**
+   * Gets or Sets enumStringRequired
+   */
+  public enum EnumStringRequiredEnum {
+    UPPER("UPPER"),
+    
+    LOWER("lower"),
+    
+    EMPTY("");
+
+    private String value;
+
+    EnumStringRequiredEnum(String value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static EnumStringRequiredEnum fromValue(String text) {
+      for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+  }
+
+  @JsonProperty("enum_string_required")
+  private EnumStringRequiredEnum enumStringRequired = null;
+
   /**
    * Gets or Sets enumInteger
    */
@@ -138,6 +174,23 @@ public class EnumTest   {
     this.enumString = enumString;
   }
 
+  /**
+   **/
+  public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
+    this.enumStringRequired = enumStringRequired;
+    return this;
+  }
+
+  
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("enum_string_required")
+  public EnumStringRequiredEnum getEnumStringRequired() {
+    return enumStringRequired;
+  }
+  public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
+    this.enumStringRequired = enumStringRequired;
+  }
+
   /**
    **/
   public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
@@ -200,6 +253,7 @@ public class EnumTest   {
     }
     EnumTest enumTest = (EnumTest) o;
     return Objects.equals(enumString, enumTest.enumString) &&
+        Objects.equals(enumStringRequired, enumTest.enumStringRequired) &&
         Objects.equals(enumInteger, enumTest.enumInteger) &&
         Objects.equals(enumNumber, enumTest.enumNumber) &&
         Objects.equals(outerEnum, enumTest.outerEnum);
@@ -207,7 +261,7 @@ public class EnumTest   {
 
   @Override
   public int hashCode() {
-    return Objects.hash(enumString, enumInteger, enumNumber, outerEnum);
+    return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum);
   }
 
   @Override
@@ -216,6 +270,7 @@ public class EnumTest   {
     sb.append("class EnumTest {\n");
     
     sb.append("    enumString: ").append(toIndentedString(enumString)).append("\n");
+    sb.append("    enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n");
     sb.append("    enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
     sb.append("    enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
     sb.append("    outerEnum: ").append(toIndentedString(outerEnum)).append("\n");

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/FormatTest.java

@@ -1,10 +1,11 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.File;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.UUID;
@@ -40,7 +41,7 @@ public class FormatTest   {
   private byte[] _byte = null;
 
   @JsonProperty("binary")
-  private byte[] binary = null;
+  private File binary = null;
 
   @JsonProperty("date")
   private Date date = null;
@@ -202,7 +203,7 @@ public class FormatTest   {
 
   /**
    **/
-  public FormatTest binary(byte[] binary) {
+  public FormatTest binary(File binary) {
     this.binary = binary;
     return this;
   }
@@ -210,10 +211,10 @@ public class FormatTest   {
   
   @ApiModelProperty(value = "")
   @JsonProperty("binary")
-  public byte[] getBinary() {
+  public File getBinary() {
     return binary;
   }
-  public void setBinary(byte[] binary) {
+  public void setBinary(File binary) {
     this.binary = binary;
   }
 

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/MapTest.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -1,16 +1,16 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.Animal;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import org.openapitools.model.Animal;
 
 
 

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Model200Response.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -64,9 +64,9 @@ public class Model200Response   {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    Model200Response _200Response = (Model200Response) o;
+    Model200Response _200response = (Model200Response) o;
-    return Objects.equals(name, _200Response.name) &&
+    return Objects.equals(name, _200response.name) &&
-        Objects.equals(propertyClass, _200Response.propertyClass);
+        Objects.equals(propertyClass, _200response.propertyClass);
   }
 
   @Override

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelApiResponse.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelReturn.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Name.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -25,7 +25,7 @@ public class Name   {
   private String property = null;
 
   @JsonProperty("123Number")
-  private Integer _123Number = null;
+  private Integer _123number = null;
 
   /**
    **/
@@ -80,19 +80,19 @@ public class Name   {
 
   /**
    **/
-  public Name _123Number(Integer _123Number) {
+  public Name _123number(Integer _123number) {
-    this._123Number = _123Number;
+    this._123number = _123number;
     return this;
   }
 
   
   @ApiModelProperty(value = "")
   @JsonProperty("123Number")
-  public Integer get123Number() {
+  public Integer get123number() {
-    return _123Number;
+    return _123number;
   }
-  public void set123Number(Integer _123Number) {
+  public void set123number(Integer _123number) {
-    this._123Number = _123Number;
+    this._123number = _123number;
   }
 
 
@@ -108,12 +108,12 @@ public class Name   {
     return Objects.equals(name, name.name) &&
         Objects.equals(snakeCase, name.snakeCase) &&
         Objects.equals(property, name.property) &&
-        Objects.equals(_123Number, name._123Number);
+        Objects.equals(_123number, name._123number);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name, snakeCase, property, _123Number);
+    return Objects.hash(name, snakeCase, property, _123number);
   }
 
   @Override
@@ -124,7 +124,7 @@ public class Name   {
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
     sb.append("    property: ").append(toIndentedString(property)).append("\n");
-    sb.append("    _123Number: ").append(toIndentedString(_123Number)).append("\n");
+    sb.append("    _123number: ").append(toIndentedString(_123number)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/NumberOnly.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Order.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/OuterComposite.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/OuterEnum.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonValue;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Pet.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -6,10 +6,10 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.Category;
-import io.swagger.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
+import org.openapitools.model.Category;
+import org.openapitools.model.Tag;
 
 
 

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ReadOnlyFirst.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/SpecialModelName.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -13,23 +13,23 @@ import io.swagger.annotations.ApiModelProperty;
 
 public class SpecialModelName   {
   @JsonProperty("$special[property.name]")
-  private Long specialPropertyName = null;
+  private Long $specialPropertyName = null;
 
   /**
    **/
-  public SpecialModelName specialPropertyName(Long specialPropertyName) {
+  public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
-    this.specialPropertyName = specialPropertyName;
+    this.$specialPropertyName = $specialPropertyName;
     return this;
   }
 
   
   @ApiModelProperty(value = "")
   @JsonProperty("$special[property.name]")
-  public Long getSpecialPropertyName() {
+  public Long get$SpecialPropertyName() {
-    return specialPropertyName;
+    return $specialPropertyName;
   }
-  public void setSpecialPropertyName(Long specialPropertyName) {
+  public void set$SpecialPropertyName(Long $specialPropertyName) {
-    this.specialPropertyName = specialPropertyName;
+    this.$specialPropertyName = $specialPropertyName;
   }
 
 
@@ -41,13 +41,13 @@ public class SpecialModelName   {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    SpecialModelName specialModelName = (SpecialModelName) o;
+    SpecialModelName $specialModelName = (SpecialModelName) o;
-    return Objects.equals(specialPropertyName, specialModelName.specialPropertyName);
+    return Objects.equals($specialPropertyName, $specialModelName.$specialPropertyName);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(specialPropertyName);
+    return Objects.hash($specialPropertyName);
   }
 
   @Override
@@ -55,7 +55,7 @@ public class SpecialModelName   {
     StringBuilder sb = new StringBuilder();
     sb.append("class SpecialModelName {\n");
     
-    sb.append("    specialPropertyName: ").append(toIndentedString(specialPropertyName)).append("\n");
+    sb.append("    $specialPropertyName: ").append(toIndentedString($specialPropertyName)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Tag.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/User.java

@@ -1,4 +1,4 @@
-package io.swagger.model;
+package org.openapitools.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;

samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/AnotherFakeController.java

@@ -1,4 +1,4 @@
-package io.swagger.controllers;
+package org.openapitools.controllers;
 
 import io.swagger.inflector.models.RequestContext;
 import io.swagger.inflector.models.ResponseContext;
@@ -8,9 +8,9 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import java.io.File;
 import java.util.List;
 
-import io.swagger.model.*;
+import org.openapitools.model.*;
 
-import io.swagger.model.Client;
+import org.openapitools.model.Client;
 
 
 public class AnotherFakeController  {
@@ -21,7 +21,7 @@ public class AnotherFakeController  {
    **/
 
   /*
-    public ResponseContext testSpecialTags(RequestContext request , Client body) {
+    public ResponseContext testSpecialTags(RequestContext request , Client client) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */

samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/FakeClassnameTestController.java

@@ -1,4 +1,4 @@
-package io.swagger.controllers;
+package org.openapitools.controllers;
 
 import io.swagger.inflector.models.RequestContext;
 import io.swagger.inflector.models.ResponseContext;
@@ -8,9 +8,9 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import java.io.File;
 import java.util.List;
 
-import io.swagger.model.*;
+import org.openapitools.model.*;
 
-import io.swagger.model.Client;
+import org.openapitools.model.Client;
 
 
 public class FakeClassnameTestController  {
@@ -21,7 +21,7 @@ public class FakeClassnameTestController  {
    **/
 
   /*
-    public ResponseContext testClassname(RequestContext request , Client body) {
+    public ResponseContext testClassname(RequestContext request , Client client) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */

samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/FakeController.java

@@ -1,4 +1,4 @@
-package io.swagger.controllers;
+package org.openapitools.controllers;
 
 import io.swagger.inflector.models.RequestContext;
 import io.swagger.inflector.models.ResponseContext;
@@ -8,12 +8,15 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import java.io.File;
 import java.util.List;
 
-import io.swagger.model.*;
+import org.openapitools.model.*;
 
 import java.math.BigDecimal;
-import io.swagger.model.Client;
+import org.openapitools.model.Client;
 import java.util.Date;
-import io.swagger.model.OuterComposite;
+import java.io.File;
+import java.util.Map;
+import org.openapitools.model.OuterComposite;
+import org.openapitools.model.User;
 
 
 public class FakeController  {
@@ -24,13 +27,13 @@ public class FakeController  {
    **/
 
   /*
-    public ResponseContext fakeOuterBooleanSerialize(RequestContext request , Boolean body) {
+    public ResponseContext fakeOuterBooleanSerialize(RequestContext request , Boolean booleanPostBody) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */
 
   /*
-    public ResponseContext fakeOuterCompositeSerialize(RequestContext request , OuterComposite body) {
+    public ResponseContext fakeOuterCompositeSerialize(RequestContext request , OuterComposite outerComposite) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */
@@ -48,25 +51,31 @@ public class FakeController  {
   */
 
   /*
-    public ResponseContext testClientModel(RequestContext request , Client body) {
+    public ResponseContext testBodyWithQueryParams(RequestContext request , String query, User user) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */
 
   /*
-    public ResponseContext testEndpointParameters(RequestContext request , BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, byte[] binary, Date date, Date dateTime, String password, String paramCallback) {
+    public ResponseContext testClientModel(RequestContext request , Client client) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */
 
   /*
-    public ResponseContext testEnumParameters(RequestContext request , List<String> enumFormStringArray, String enumFormString, List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble) {
+    public ResponseContext testEndpointParameters(RequestContext request , BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, FormDataContentDisposition fileDetail, Date date, Date dateTime, String password, String paramCallback) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */
 
   /*
-    public ResponseContext testInlineAdditionalProperties(RequestContext request , Object param) {
+    public ResponseContext testEnumParameters(RequestContext request , List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+  /*
+    public ResponseContext testInlineAdditionalProperties(RequestContext request , String requestBody) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */

samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/PetController.java

@@ -1,4 +1,4 @@
-package io.swagger.controllers;
+package org.openapitools.controllers;
 
 import io.swagger.inflector.models.RequestContext;
 import io.swagger.inflector.models.ResponseContext;
@@ -8,11 +8,11 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import java.io.File;
 import java.util.List;
 
-import io.swagger.model.*;
+import org.openapitools.model.*;
 
 import java.io.File;
-import io.swagger.model.ModelApiResponse;
+import org.openapitools.model.ModelApiResponse;
-import io.swagger.model.Pet;
+import org.openapitools.model.Pet;
 
 
 public class PetController  {
@@ -23,7 +23,7 @@ public class PetController  {
    **/
 
   /*
-    public ResponseContext addPet(RequestContext request , Pet body) {
+    public ResponseContext addPet(RequestContext request , Pet pet) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */
@@ -53,7 +53,7 @@ public class PetController  {
   */
 
   /*
-    public ResponseContext updatePet(RequestContext request , Pet body) {
+    public ResponseContext updatePet(RequestContext request , Pet pet) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */

samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/StoreController.java

@@ -1,4 +1,4 @@
-package io.swagger.controllers;
+package org.openapitools.controllers;
 
 import io.swagger.inflector.models.RequestContext;
 import io.swagger.inflector.models.ResponseContext;
@@ -8,10 +8,10 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import java.io.File;
 import java.util.List;
 
-import io.swagger.model.*;
+import org.openapitools.model.*;
 
 import java.util.Map;
-import io.swagger.model.Order;
+import org.openapitools.model.Order;
 
 
 public class StoreController  {
@@ -40,7 +40,7 @@ public class StoreController  {
   */
 
   /*
-    public ResponseContext placeOrder(RequestContext request , Order body) {
+    public ResponseContext placeOrder(RequestContext request , Order order) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */

samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/UserController.java

@@ -1,4 +1,4 @@
-package io.swagger.controllers;
+package org.openapitools.controllers;
 
 import io.swagger.inflector.models.RequestContext;
 import io.swagger.inflector.models.ResponseContext;
@@ -8,10 +8,10 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import java.io.File;
 import java.util.List;
 
-import io.swagger.model.*;
+import org.openapitools.model.*;
 
 import java.util.List;
-import io.swagger.model.User;
+import org.openapitools.model.User;
 
 
 public class UserController  {
@@ -22,19 +22,19 @@ public class UserController  {
    **/
 
   /*
-    public ResponseContext createUser(RequestContext request , User body) {
+    public ResponseContext createUser(RequestContext request , User user) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */
 
   /*
-    public ResponseContext createUsersWithArrayInput(RequestContext request , List<User> body) {
+    public ResponseContext createUsersWithArrayInput(RequestContext request , List<User> user) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */
 
   /*
-    public ResponseContext createUsersWithListInput(RequestContext request , List<User> body) {
+    public ResponseContext createUsersWithListInput(RequestContext request , List<User> user) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */
@@ -64,7 +64,7 @@ public class UserController  {
   */
 
   /*
-    public ResponseContext updateUser(RequestContext request , String username, User body) {
+    public ResponseContext updateUser(RequestContext request , String username, User user) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */