Regenerate template using the config (OpenAPITools#2901)

samples/client/petstore/java/feign-no-nullable/.openapi-generator/FILES

@@ -0,0 +1,80 @@
+.gitignore
+.travis.yml
+README.md
+api/openapi.yaml
+build.gradle
+build.sbt
+git_push.sh
+gradle.properties
+gradle/wrapper/gradle-wrapper.jar
+gradle/wrapper/gradle-wrapper.properties
+gradlew
+gradlew.bat
+pom.xml
+settings.gradle
+src/main/AndroidManifest.xml
+src/main/java/org/openapitools/client/ApiClient.java
+src/main/java/org/openapitools/client/CustomInstantDeserializer.java
+src/main/java/org/openapitools/client/EncodingUtils.java
+src/main/java/org/openapitools/client/ParamExpander.java
+src/main/java/org/openapitools/client/RFC3339DateFormat.java
+src/main/java/org/openapitools/client/ServerConfiguration.java
+src/main/java/org/openapitools/client/ServerVariable.java
+src/main/java/org/openapitools/client/StringUtil.java
+src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+src/main/java/org/openapitools/client/api/FakeApi.java
+src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+src/main/java/org/openapitools/client/api/PetApi.java
+src/main/java/org/openapitools/client/api/StoreApi.java
+src/main/java/org/openapitools/client/api/UserApi.java
+src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
+src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
+src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
+src/main/java/org/openapitools/client/auth/OAuth.java
+src/main/java/org/openapitools/client/auth/OAuthFlow.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+src/main/java/org/openapitools/client/model/Animal.java
+src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+src/main/java/org/openapitools/client/model/ArrayTest.java
+src/main/java/org/openapitools/client/model/BigCat.java
+src/main/java/org/openapitools/client/model/BigCatAllOf.java
+src/main/java/org/openapitools/client/model/Capitalization.java
+src/main/java/org/openapitools/client/model/Cat.java
+src/main/java/org/openapitools/client/model/CatAllOf.java
+src/main/java/org/openapitools/client/model/Category.java
+src/main/java/org/openapitools/client/model/ClassModel.java
+src/main/java/org/openapitools/client/model/Client.java
+src/main/java/org/openapitools/client/model/Dog.java
+src/main/java/org/openapitools/client/model/DogAllOf.java
+src/main/java/org/openapitools/client/model/EnumArrays.java
+src/main/java/org/openapitools/client/model/EnumClass.java
+src/main/java/org/openapitools/client/model/EnumTest.java
+src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+src/main/java/org/openapitools/client/model/FormatTest.java
+src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+src/main/java/org/openapitools/client/model/MapTest.java
+src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+src/main/java/org/openapitools/client/model/Model200Response.java
+src/main/java/org/openapitools/client/model/ModelApiResponse.java
+src/main/java/org/openapitools/client/model/ModelReturn.java
+src/main/java/org/openapitools/client/model/Name.java
+src/main/java/org/openapitools/client/model/NumberOnly.java
+src/main/java/org/openapitools/client/model/Order.java
+src/main/java/org/openapitools/client/model/OuterComposite.java
+src/main/java/org/openapitools/client/model/OuterEnum.java
+src/main/java/org/openapitools/client/model/Pet.java
+src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+src/main/java/org/openapitools/client/model/SpecialModelName.java
+src/main/java/org/openapitools/client/model/Tag.java
+src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+src/main/java/org/openapitools/client/model/TypeHolderExample.java
+src/main/java/org/openapitools/client/model/User.java
+src/main/java/org/openapitools/client/model/XmlItem.java

samples/client/petstore/java/feign-no-nullable/.openapi-generator/VERSION

@@ -1 +1 @@
-4.3.1-SNAPSHOT
+5.0.0-SNAPSHOT

samples/client/petstore/java/feign-no-nullable/README.md

@@ -1,4 +1,4 @@
-# petstore-feign
+# petstore-feign-no-nullable
 
 ## Requirements
 
@@ -25,7 +25,7 @@ After the client library is installed/deployed, you can use it in your Maven pro
 ```xml
 <dependency>
     <groupId>org.openapitools</groupId>
-    <artifactId>petstore-feign</artifactId>
+    <artifactId>petstore-feign-no-nullable</artifactId>
     <version>1.0.0</version>
     <scope>compile</scope>
 </dependency>

samples/client/petstore/java/feign-no-nullable/api/openapi.yaml

@@ -144,6 +144,7 @@ paths:
           items:
             type: string
           type: array
+          uniqueItems: true
         style: form
       responses:
         "200":
@@ -153,11 +154,13 @@ paths:
                 items:
                   $ref: '#/components/schemas/Pet'
                 type: array
+                uniqueItems: true
             application/json:
               schema:
                 items:
                   $ref: '#/components/schemas/Pet'
                 type: array
+                uniqueItems: true
           description: successful operation
         "400":
           content: {}
@@ -1384,6 +1387,7 @@ components:
           items:
             type: string
           type: array
+          uniqueItems: true
           xml:
             name: photoUrl
             wrapped: true
@@ -2147,10 +2151,12 @@ components:
       properties:
         breed:
           type: string
+      type: object
     Cat_allOf:
       properties:
         declawed:
           type: boolean
+      type: object
     BigCat_allOf:
       properties:
         kind:
@@ -2160,6 +2166,7 @@ components:
           - leopards
           - jaguars
           type: string
+      type: object
   securitySchemes:
     petstore_auth:
       flows:

samples/client/petstore/java/feign-no-nullable/build.gradle

@@ -84,7 +84,7 @@ if(hasProperty('target') && target == 'android') {
 
     install {
         repositories.mavenInstaller {
-            pom.artifactId = 'petstore-feign'
+            pom.artifactId = 'petstore-feign-no-nullable'
         }
     }
 
@@ -99,8 +99,8 @@ ext {
     jackson_version = "2.10.3"
     jackson_databind_version = "2.10.3"
     jackson_threetenbp_version = "2.9.10"
-    feign_version = "9.7.0"
-    feign_form_version = "2.1.0"
+    feign_version = "10.11"
+    feign_form_version = "3.8.0"
     junit_version = "4.13"
     oltu_version = "1.0.1"
 }
@@ -118,5 +118,6 @@ dependencies {
     compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
     compile "com.brsanthu:migbase64:2.2"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }

samples/client/petstore/java/feign-no-nullable/build.sbt

@@ -1,7 +1,7 @@
 lazy val root = (project in file(".")).
   settings(
     organization := "org.openapitools",
-    name := "petstore-feign",
+    name := "petstore-feign-no-nullable",
     version := "1.0.0",
     scalaVersion := "2.11.4",
     scalacOptions ++= Seq("-feature"),
@@ -10,17 +10,18 @@ lazy val root = (project in file(".")).
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       "io.swagger" % "swagger-annotations" % "1.5.24" % "compile",
-      "io.github.openfeign" % "feign-core" % "9.7.0" % "compile",
-      "io.github.openfeign" % "feign-jackson" % "9.7.0" % "compile",
-      "io.github.openfeign" % "feign-slf4j" % "9.7.0" % "compile",
-      "io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
+      "io.github.openfeign" % "feign-core" % "10.11" % "compile",
+      "io.github.openfeign" % "feign-jackson" % "10.11" % "compile",
+      "io.github.openfeign" % "feign-slf4j" % "10.11" % "compile",
+      "io.github.openfeign.form" % "feign-form" % "3.8.0" % "compile",
       "com.fasterxml.jackson.core" % "jackson-core" % "2.10.3" % "compile",
       "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3" % "compile",
       "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.3" % "compile",
       "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
       "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
       "com.brsanthu" % "migbase64" % "2.2" % "compile",
+      "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
       "junit" % "junit" % "4.13" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )

samples/client/petstore/java/feign-no-nullable/pom.xml

@@ -2,9 +2,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openapitools</groupId>
-    <artifactId>petstore-feign</artifactId>
+    <artifactId>petstore-feign-no-nullable</artifactId>
     <packaging>jar</packaging>
-    <name>petstore-feign</name>
+    <name>petstore-feign-no-nullable</name>
     <version>1.0.0</version>
     <url>https://github.com/openapitools/openapi-generator</url>
     <description>OpenAPI Java</description>
@@ -154,6 +154,7 @@
                 <version>3.1.1</version>
                 <configuration>
                     <doclint>none</doclint>
+                        <source>1.7</source>
                 </configuration>
                 <executions>
                     <execution>
@@ -266,6 +267,12 @@
             <artifactId>org.apache.oltu.oauth2.client</artifactId>
             <version>${oltu-version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -293,11 +300,12 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <swagger-annotations-version>1.5.24</swagger-annotations-version>
-        <feign-version>9.7.0</feign-version>
-        <feign-form-version>2.1.0</feign-form-version>
+        <feign-version>10.11</feign-version>
+        <feign-form-version>3.8.0</feign-form-version>
         <jackson-version>2.10.3</jackson-version>
         <jackson-databind-version>2.10.3</jackson-databind-version>
         <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
+        <javax-annotation-version>1.3.2</javax-annotation-version>
         <junit-version>4.13</junit-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <oltu-version>1.0.1</oltu-version>

samples/client/petstore/java/feign-no-nullable/settings.gradle

@@ -1 +1 @@
-rootProject.name = "petstore-feign"
+rootProject.name = "petstore-feign-no-nullable"

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/ApiClient.java

@@ -22,7 +22,7 @@
 import org.openapitools.client.auth.*;
 import org.openapitools.client.auth.OAuth.AccessTokenListener;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiClient {
   public interface Api {}
 

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/StringUtil.java

@@ -13,7 +13,10 @@
 
 package org.openapitools.client;
 
+import java.util.Collection;
+import java.util.Iterator;
 
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
@@ -58,4 +61,23 @@ public static String join(String[] array, String separator) {
     }
     return out.toString();
   }
+
+  /**
+   * Join a list of strings with the given separator.
+   *
+   * @param list      The list of strings
+   * @param separator The separator
+   * @return the resulting string
+   */
+  public static String join(Collection<String> list, String separator) {
+    Iterator<String> iterator = list.iterator();
+    StringBuilder out = new StringBuilder();
+    if (iterator.hasNext()) {
+      out.append(iterator.next());
+    }
+    while (iterator.hasNext()) {
+      out.append(separator).append(iterator.next());
+    }
+    return out.toString();
+  }
 }

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

@@ -11,7 +11,7 @@
 import java.util.Map;
 import feign.*;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public interface AnotherFakeApi extends ApiClient.Api {
 
 

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java

@@ -19,7 +19,7 @@
 import java.util.Map;
 import feign.*;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public interface FakeApi extends ApiClient.Api {
 
 
@@ -407,7 +407,7 @@ public TestQueryParameterCollectionFormatQueryParams ioutil(final List<String> v
       return this;
     }
     public TestQueryParameterCollectionFormatQueryParams http(final List<String> value) {
-      put("http", EncodingUtils.encodeCollection(value, "space"));
+      put("http", EncodingUtils.encodeCollection(value, "ssv"));
       return this;
     }
     public TestQueryParameterCollectionFormatQueryParams url(final List<String> value) {

samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java

@@ -11,7 +11,7 @@
 import java.util.Map;
 import feign.*;
 
-
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public interface FakeClassnameTags123Api extends ApiClient.Api {