Merge pull request #3312 from wing328/java_okthtp_default

[Java] Set Java default library to "okhttp-gson"

bin/java-petstore-all.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # update java petstore for all supported http libraries
 
-./bin/java-petstore.sh
+./bin/java-petstore-jersey1.sh
 ./bin/java-petstore-jersey2.sh
 ./bin/java-petstore-feign.sh
 ./bin/java-petstore-okhttp-gson.sh

bin/java-petstore-jersey1.sh

@@ -26,9 +26,9 @@ 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 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -o samples/client/petstore/java/default -DhideGenerationTimestamp=true"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -o samples/client/petstore/java/jersey1 -DhideGenerationTimestamp=true --library=jersey1"
 
-echo "Removing files and folders under samples/client/petstore/java/default/src/main"
-rm -rf samples/client/petstore/java/default/src/main
-find samples/client/petstore/java/default -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
+echo "Removing files and folders under samples/client/petstore/java/jersey1/src/main"
+rm -rf samples/client/petstore/java/jersey1/src/main
+find samples/client/petstore/java/jersey1 -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java

@@ -32,17 +32,19 @@ public class JavaClientCodegen extends AbstractJavaCodegen {
 
         cliOptions.add(CliOption.newBoolean(USE_RX_JAVA, "Whether to use the RxJava adapter with the retrofit2 library."));
 
-        supportedLibraries.put(DEFAULT_LIBRARY, "HTTP client: Jersey client 1.19.1. JSON processing: Jackson 2.7.0");
+        supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.1. JSON processing: Jackson 2.7.0");
         supportedLibraries.put("feign", "HTTP client: Netflix Feign 8.16.0. JSON processing: Jackson 2.7.0");
         supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.22.2. JSON processing: Jackson 2.7.0");
         supportedLibraries.put("okhttp-gson", "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.6.2");
         supportedLibraries.put(RETROFIT_1, "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.3.1 (Retrofit 1.9.0)");
         supportedLibraries.put(RETROFIT_2, "HTTP client: OkHttp 3.2.0. JSON processing: Gson 2.6.1 (Retrofit 2.0.2). Enable the RxJava adapter using '-DuseRxJava=true'. (RxJava 1.1.3)");
 
-        CliOption library = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use");
-        library.setEnum(supportedLibraries);
-        library.setDefault(DEFAULT_LIBRARY);
-        cliOptions.add(library);
+        CliOption libraryOption = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use");
+        libraryOption.setEnum(supportedLibraries);
+        libraryOption.setDefault("okhttp-gson");
+        cliOptions.add(libraryOption);
+
+        setLibrary("okhttp-gson");
 
     }
 
@@ -76,6 +78,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen {
         writeOptional(outputFolder, new SupportingFile("pom.mustache", "", "pom.xml"));
         writeOptional(outputFolder, new SupportingFile("README.mustache", "", "README.md"));
         writeOptional(outputFolder, new SupportingFile("build.gradle.mustache", "", "build.gradle"));
+        writeOptional(outputFolder, new SupportingFile("build.sbt.mustache", "", "build.sbt"));
         writeOptional(outputFolder, new SupportingFile("settings.gradle.mustache", "", "settings.gradle"));
         writeOptional(outputFolder, new SupportingFile("gradle.properties.mustache", "", "gradle.properties"));
         writeOptional(outputFolder, new SupportingFile("manifest.mustache", projectFolder, "AndroidManifest.xml"));
@@ -95,11 +98,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen {
         supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
         supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
 
-        if (!StringUtils.isEmpty(getLibrary())) {
-            //TODO: add sbt support to default client
-            supportingFiles.add(new SupportingFile("build.sbt.mustache", "", "build.sbt"));
-        }
-
         //TODO: add doc to retrofit1 and feign
         if ( "feign".equals(getLibrary()) || "retrofit".equals(getLibrary()) ){
             modelDocTemplateFiles.remove("model_doc.mustache");
@@ -116,7 +114,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen {
         if ("feign".equals(getLibrary())) {
             supportingFiles.add(new SupportingFile("FormAwareEncoder.mustache", invokerFolder, "FormAwareEncoder.java"));
             additionalProperties.put("jackson", "true");
-        } else if ("okhttp-gson".equals(getLibrary())) {
+        } else if ("okhttp-gson".equals(getLibrary()) || StringUtils.isEmpty(getLibrary())) {
             // the "okhttp-gson" library template requires "ApiCallback.mustache" for async call
             supportingFiles.add(new SupportingFile("ApiCallback.mustache", invokerFolder, "ApiCallback.java"));
             supportingFiles.add(new SupportingFile("ApiResponse.mustache", invokerFolder, "ApiResponse.java"));
@@ -131,8 +129,10 @@ public class JavaClientCodegen extends AbstractJavaCodegen {
         } else if("jersey2".equals(getLibrary())) {
             supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java"));
             additionalProperties.put("jackson", "true");
-        } else if(StringUtils.isEmpty(getLibrary())) {
+        } else if("jersey1".equals(getLibrary())) {
             additionalProperties.put("jackson", "true");
+        } else {
+            LOGGER.error("Unknown library option (-l/--library): " + getLibrary());
         }
     }
 
@@ -175,7 +175,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen {
     public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
         super.postProcessModelProperty(model, property);
         if(!BooleanUtils.toBoolean(model.isEnum)) {
-            final String lib = getLibrary();
+            //final String lib = getLibrary();
             //Needed imports for Jackson based libraries
             if(additionalProperties.containsKey("jackson")) {
                 model.imports.add("JsonProperty");

modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache

@@ -790,6 +790,7 @@ public class ApiClient {
      * @throws ApiException If fail to deserialize response body, i.e. cannot read response body
      *   or the Content-Type of the response is not supported.
      */
+    @SuppressWarnings("unchecked")
     public <T> T deserialize(Response response, Type returnType) throws ApiException {
         if (response == null || returnType == null) {
             return null;
@@ -984,6 +985,7 @@ public class ApiClient {
      * @param returnType Return type
      * @param callback ApiCallback
      */
+    @SuppressWarnings("unchecked")
     public <T> void executeAsync(Call call, final Type returnType, final ApiCallback<T> callback) {
         call.enqueue(new Callback() {
             @Override

modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache

@@ -92,6 +92,7 @@ public class JSON {
      * @param returnType The type to deserialize inot
      * @return The deserialized Java object
      */
+    @SuppressWarnings("unchecked")
     public <T> T deserialize(String body, Type returnType) {
         try {
             if (apiClient.isLenientOnJson()) {
@@ -287,4 +288,4 @@ class LocalDateTypeAdapter extends TypeAdapter<LocalDate> {
         }
     }
 }
-{{/java8}}
+{{/java8}}

modules/swagger-codegen/src/test/java/io/swagger/codegen/DefaultGeneratorTest.java

@@ -163,6 +163,7 @@ public class DefaultGeneratorTest {
 
         final Swagger swagger = new SwaggerParser().read("src/test/resources/petstore.json");
         CodegenConfig codegenConfig = new JavaClientCodegen();
+        codegenConfig.setLibrary("jersey1");
         codegenConfig.setOutputDir(output.getAbsolutePath());
 
         ClientOptInput clientOptInput = new ClientOptInput().opts(new ClientOpts()).swagger(swagger).config(codegenConfig);

modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java

@@ -22,6 +22,6 @@ public class OnlineJavaClientOptionsTest {
         assertNotNull(options);
         final CliOption opt = options.get(CodegenConstants.LIBRARY);
         assertNotNull(opt);
-        assertEquals(opt.getDefault(), JavaClientCodegen.DEFAULT_LIBRARY);
+        assertEquals(opt.getDefault(), "okhttp-gson");
     }
 }

pom.xml

@@ -283,7 +283,7 @@
             </modules>
         </profile>
         <profile>
-            <id>java-client</id>
+            <id>java-client-jersey1</id>
             <activation>
                 <property>
                     <name>env</name>
@@ -291,7 +291,7 @@
                 </property>
             </activation>
             <modules>
-                <module>samples/client/petstore/java/default</module>
+                <module>samples/client/petstore/java/jersey1</module>
             </modules>
         </profile>
         <profile>
@@ -615,7 +615,7 @@
                 <module>samples/client/petstore/typescript-node/npm</module>
                 <module>samples/client/petstore/android/volley</module>
                 <module>samples/client/petstore/clojure</module>
-                <module>samples/client/petstore/java/default</module>
+                <module>samples/client/petstore/java/jersey1</module>
                 <module>samples/client/petstore/java/feign</module>
                 <module>samples/client/petstore/java/jersey2</module>
                 <module>samples/client/petstore/java/okhttp-gson</module>

samples/client/petstore/java/default/src/test/java/io/swagger/PetstoreProfiling.java

@@ -1,106 +0,0 @@
-package io.swagger;
-
-import java.io.*;
-import java.util.*;
-
-import io.swagger.client.*;
-import io.swagger.client.api.*;
-import io.swagger.client.model.*;
-
-public class PetstoreProfiling {
-    public int total = 5;
-    public Long newPetId = 50003L;
-    public String outputFile = "./petstore_profiling.output";
-
-    public void callApis(int index, List<Map<String, String>> results) {
-        long start;
-
-        try {
-            PetApi petApi = new PetApi();
-
-            /* ADD PET */
-            Pet pet = new Pet();
-            pet.setId(newPetId);
-            pet.setName("profiler");
-            pet.setStatus(Pet.StatusEnum.AVAILABLE);
-            pet.setPhotoUrls(Arrays.asList("http://profiler.com"));
-            // new tag
-            Tag tag = new Tag();
-            tag.setId(newPetId); // use the same id as pet
-            tag.setName("profile tag 1");
-            // new category
-            Category category = new Category();
-            category.setId(newPetId); // use the same id as pet
-            category.setName("profile category 1");
-
-            pet.setTags(Arrays.asList(tag));
-            pet.setCategory(category);
-
-            /* ADD PET */
-            start = System.nanoTime();
-            petApi.addPet(pet);
-            results.add(buildResult(index, "ADD PET", System.nanoTime() - start));
-
-            /* GET PET */
-            start = System.nanoTime();
-            pet = petApi.getPetById(newPetId);
-            results.add(buildResult(index, "GET PET", System.nanoTime() - start));
-
-            /* UPDATE PET WITH FORM */
-            start = System.nanoTime();
-            petApi.updatePetWithForm(newPetId, "new profiler", "sold");
-            results.add(buildResult(index, "UPDATE PET", System.nanoTime() - start));
-
-            /* DELETE PET */
-            start = System.nanoTime();
-            petApi.deletePet(newPetId, "special-key");
-            results.add(buildResult(index, "DELETE PET", System.nanoTime() - start));
-        } catch (ApiException e) {
-            System.out.println("Caught error: " + e.getMessage());
-            System.out.println("HTTP response headers: " + e.getResponseHeaders());
-            System.out.println("HTTP response body: " + e.getResponseBody());
-            System.out.println("HTTP status code: " + e.getCode());
-        }
-    }
-
-    public void run() {
-        System.out.printf("Running profiling... (total: %s)\n", total);
-
-        List<Map<String, String>> results = new ArrayList<Map<String, String>>();
-        for (int i = 0; i < total; i++) {
-            callApis(i, results);
-        }
-        writeResultsToFile(results);
-
-        System.out.printf("Profiling results written to %s\n", outputFile);
-    }
-
-    private Map<String, String> buildResult(int index, String name, long time) {
-        Map<String, String> result = new HashMap<String, String>();
-        result.put("index", String.valueOf(index));
-        result.put("name", name);
-        result.put("time", String.valueOf(time / 1000000000.0));
-        return result;
-    }
-
-    private void writeResultsToFile(List<Map<String, String>> results) {
-        try {
-            java.io.File file = new java.io.File(outputFile);
-            PrintWriter writer = new PrintWriter(file);
-            String command = "mvn compile test-compile exec:java -Dexec.classpathScope=test -Dexec.mainClass=\"io.swagger.PetstoreProfiling\"";
-            writer.println("# To run the profiling:");
-            writer.printf("#   %s\n\n", command);
-            for (Map<String, String> result : results) {
-                writer.printf("%s: %s => %s\n", result.get("index"), result.get("name"), result.get("time"));
-            }
-            writer.close();
-        } catch (FileNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static void main(String[] args) {
-        final PetstoreProfiling profiling = new PetstoreProfiling();
-        profiling.run();
-    }
-}

samples/client/petstore/java/default/src/test/java/io/swagger/TestUtils.java

@@ -1,17 +0,0 @@
-package io.swagger;
-
-import java.util.Random;
-import java.util.concurrent.atomic.AtomicLong;
-
-public class TestUtils {
-    private static final AtomicLong atomicId = createAtomicId();
-
-    public static long nextId() {
-      return atomicId.getAndIncrement();
-    }
-
-    private static AtomicLong createAtomicId() {
-        int baseId = new Random(System.currentTimeMillis()).nextInt(1000000) + 20000;
-        return new AtomicLong((long) baseId);
-    }
-}

samples/client/petstore/java/default/src/test/java/io/swagger/client/ApiClientTest.java

@@ -1,239 +0,0 @@
-package io.swagger.client;
-
-import io.swagger.client.auth.*;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-
-public class ApiClientTest {
-    ApiClient apiClient = null;
-
-    @Before
-    public void setup() {
-        apiClient = new ApiClient();
-    }
-
-    @Test
-    public void testParseAndFormatDate() {
-        // default date format
-        String dateStr = "2015-11-07T03:49:09.356Z";
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356+00:00")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356Z")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T05:49:09.356+02:00")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00")));
-
-        // custom date format: without milli-seconds, custom time zone
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
-        format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
-        apiClient.setDateFormat(format);
-        dateStr = "2015-11-07T13:49:09+10:00";
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09+00:00")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09Z")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T00:49:09-03:00")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T13:49:09+10:00")));
-    }
-
-    @Test
-    public void testIsJsonMime() {
-      assertFalse(apiClient.isJsonMime(null));
-      assertFalse(apiClient.isJsonMime(""));
-      assertFalse(apiClient.isJsonMime("text/plain"));
-      assertFalse(apiClient.isJsonMime("application/xml"));
-      assertFalse(apiClient.isJsonMime("application/jsonp"));
-
-      assertTrue(apiClient.isJsonMime("application/json"));
-      assertTrue(apiClient.isJsonMime("application/json; charset=UTF8"));
-      assertTrue(apiClient.isJsonMime("APPLICATION/JSON"));
-    }
-
-    @Test
-    public void testSelectHeaderAccept() {
-        String[] accepts = {"application/json", "application/xml"};
-        assertEquals("application/json", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{"APPLICATION/XML", "APPLICATION/JSON"};
-        assertEquals("APPLICATION/JSON", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{"application/xml", "application/json; charset=UTF8"};
-        assertEquals("application/json; charset=UTF8", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{"text/plain", "application/xml"};
-        assertEquals("text/plain,application/xml", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{};
-        assertNull(apiClient.selectHeaderAccept(accepts));
-    }
-
-    @Test
-    public void testSelectHeaderContentType() {
-        String[] contentTypes = {"application/json", "application/xml"};
-        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{"APPLICATION/JSON", "APPLICATION/XML"};
-        assertEquals("APPLICATION/JSON", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{"application/xml", "application/json; charset=UTF8"};
-        assertEquals("application/json; charset=UTF8", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{"text/plain", "application/xml"};
-        assertEquals("text/plain", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{};
-        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
-    }
-
-    @Test
-    public void testGetAuthentications() {
-        Map<String, Authentication> auths = apiClient.getAuthentications();
-
-        Authentication auth = auths.get("api_key");
-        assertNotNull(auth);
-        assertTrue(auth instanceof ApiKeyAuth);
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) auth;
-        assertEquals("header", apiKeyAuth.getLocation());
-        assertEquals("api_key", apiKeyAuth.getParamName());
-
-        auth = auths.get("petstore_auth");
-        assertTrue(auth instanceof OAuth);
-        assertSame(auth, apiClient.getAuthentication("petstore_auth"));
-
-        assertNull(auths.get("unknown"));
-
-        try {
-            auths.put("my_auth", new HttpBasicAuth());
-            fail("the authentications returned should not be modifiable");
-        } catch (UnsupportedOperationException e) {
-        }
-    }
-
-    @Ignore("There is no more basic auth in petstore security definitions")
-    @Test
-    public void testSetUsernameAndPassword() {
-        HttpBasicAuth auth = null;
-        for (Authentication _auth : apiClient.getAuthentications().values()) {
-            if (_auth instanceof HttpBasicAuth) {
-                auth = (HttpBasicAuth) _auth;
-                break;
-            }
-        }
-        auth.setUsername(null);
-        auth.setPassword(null);
-
-        apiClient.setUsername("my-username");
-        apiClient.setPassword("my-password");
-        assertEquals("my-username", auth.getUsername());
-        assertEquals("my-password", auth.getPassword());
-
-        // reset values
-        auth.setUsername(null);
-        auth.setPassword(null);
-    }
-
-    @Test
-    public void testSetApiKeyAndPrefix() {
-        ApiKeyAuth auth = null;
-        for (Authentication _auth : apiClient.getAuthentications().values()) {
-            if (_auth instanceof ApiKeyAuth) {
-                auth = (ApiKeyAuth) _auth;
-                break;
-            }
-        }
-        auth.setApiKey(null);
-        auth.setApiKeyPrefix(null);
-
-        apiClient.setApiKey("my-api-key");
-        apiClient.setApiKeyPrefix("Token");
-        assertEquals("my-api-key", auth.getApiKey());
-        assertEquals("Token", auth.getApiKeyPrefix());
-
-        // reset values
-        auth.setApiKey(null);
-        auth.setApiKeyPrefix(null);
-    }
-
-    @Test
-    public void testParameterToPairsWhenNameIsInvalid() throws Exception {
-        List<Pair> pairs_a = apiClient.parameterToPairs("csv", null, new Integer(1));
-        List<Pair> pairs_b = apiClient.parameterToPairs("csv", "", new Integer(1));
-
-        assertTrue(pairs_a.isEmpty());
-        assertTrue(pairs_b.isEmpty());
-    }
-
-    @Test
-    public void testParameterToPairsWhenValueIsNull() throws Exception {
-        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", null);
-
-        assertTrue(pairs.isEmpty());
-    }
-
-    @Test
-    public void testParameterToPairsWhenValueIsEmptyStrings() throws Exception {
-
-        // single empty string
-        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", " ");
-        assertEquals(1, pairs.size());
-
-        // list of empty strings
-        List<String> strs = new ArrayList<String>();
-        strs.add(" ");
-        strs.add(" ");
-        strs.add(" ");
-
-        List<Pair> concatStrings = apiClient.parameterToPairs("csv", "param-a", strs);
-
-        assertEquals(1, concatStrings.size());
-        assertFalse(concatStrings.get(0).getValue().isEmpty()); // should contain some delimiters
-    }
-
-    @Test
-    public void testParameterToPairsWhenValueIsNotCollection() throws Exception {
-        String name = "param-a";
-        Integer value = 1;
-
-        List<Pair> pairs = apiClient.parameterToPairs("csv", name, value);
-
-        assertEquals(1, pairs.size());
-        assertEquals(value, Integer.valueOf(pairs.get(0).getValue()));
-    }
-
-    @Test
-    public void testParameterToPairsWhenValueIsCollection() throws Exception {
-        Map<String, String> collectionFormatMap = new HashMap<String, String>();
-        collectionFormatMap.put("csv", ",");
-        collectionFormatMap.put("tsv", "\t");
-        collectionFormatMap.put("ssv", " ");
-        collectionFormatMap.put("pipes", "\\|");
-        collectionFormatMap.put("", ","); // no format, must default to csv
-        collectionFormatMap.put("unknown", ","); // all other formats, must default to csv
-
-        String name = "param-a";
-
-        List<Object> values = new ArrayList<Object>();
-        values.add("value-a");
-        values.add(123);
-        values.add(new Date());
-
-        // check for multi separately
-        List<Pair> multiPairs = apiClient.parameterToPairs("multi", name, values);
-        assertEquals(values.size(), multiPairs.size());
-
-        // all other formats
-        for (String collectionFormat : collectionFormatMap.keySet()) {
-            List<Pair> pairs = apiClient.parameterToPairs(collectionFormat, name, values);
-
-            assertEquals(1, pairs.size());
-
-            String delimiter = collectionFormatMap.get(collectionFormat);
-            String[] pairValueSplit = pairs.get(0).getValue().split(delimiter);
-
-            // must equal input values
-            assertEquals(values.size(), pairValueSplit.length);
-        }
-    }
-}

samples/client/petstore/java/default/src/test/java/io/swagger/client/ConfigurationTest.java

@@ -1,15 +0,0 @@
-package io.swagger.client;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-
-public class ConfigurationTest {
-    @Test
-    public void testDefaultApiClient() {
-        ApiClient apiClient = Configuration.getDefaultApiClient();
-        assertNotNull(apiClient);
-        assertEquals("http://petstore.swagger.io/v2", apiClient.getBasePath());
-        assertFalse(apiClient.isDebugging());
-    }
-}

samples/client/petstore/java/default/src/test/java/io/swagger/client/StringUtilTest.java

@@ -1,33 +0,0 @@
-package io.swagger.client;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-
-public class StringUtilTest {
-    @Test
-    public void testContainsIgnoreCase() {
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "abc"));
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "ABC"));
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{"ABC"}, "abc"));
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, "ABC"));
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, null));
-
-        assertFalse(StringUtil.containsIgnoreCase(new String[]{"abc"}, "def"));
-        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, "ABC"));
-        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, null));
-    }
-
-    @Test
-    public void testJoin() {
-        String[] array = {"aa", "bb", "cc"};
-        assertEquals("aa,bb,cc", StringUtil.join(array, ","));
-        assertEquals("aa, bb, cc", StringUtil.join(array, ", "));
-        assertEquals("aabbcc", StringUtil.join(array, ""));
-        assertEquals("aa bb cc", StringUtil.join(array, " "));
-        assertEquals("aa\nbb\ncc", StringUtil.join(array, "\n"));
-
-        assertEquals("", StringUtil.join(new String[]{}, ","));
-        assertEquals("abc", StringUtil.join(new String[]{"abc"}, ","));
-    }
-}

samples/client/petstore/java/default/src/test/java/io/swagger/client/api/FakeApiTest.java

@@ -1,48 +0,0 @@
-package io.swagger.client.api;
-
-import io.swagger.client.ApiException;
-import java.math.BigDecimal;
-import java.util.Date;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for FakeApi
- */
-public class FakeApiTest {
-
-    private final FakeApi api = new FakeApi();
-
-    
-    /**
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     *
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void testEndpointParametersTest() throws ApiException {
-        BigDecimal number = null;
-        Double _double = null;
-        String string = null;
-        byte[] _byte = null;
-        Integer integer = null;
-        Integer int32 = null;
-        Long int64 = null;
-        Float _float = null;
-        byte[] binary = null;
-        Date date = null;
-        Date dateTime = null;
-        String password = null;
-        // api.testEndpointParameters(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password);
-
-        // TODO: test validations
-    }
-    
-}

samples/client/petstore/java/default/src/test/java/io/swagger/client/api/PetApiTest.java

@@ -1,306 +0,0 @@
-package io.swagger.client.api;
-
-import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.datatype.joda.*;
-
-import io.swagger.TestUtils;
-
-import io.swagger.client.*;
-import io.swagger.client.api.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class PetApiTest {
-    private PetApi api;
-    private ObjectMapper mapper;
-
-    @Before
-    public void setup() {
-        api = new PetApi();
-        // setup authentication
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
-        apiKeyAuth.setApiKey("special-key");
-    }
-
-    @Test
-    public void testApiClient() {
-        // the default api client is used
-        assertEquals(Configuration.getDefaultApiClient(), api.getApiClient());
-        assertNotNull(api.getApiClient());
-        assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
-        assertFalse(api.getApiClient().isDebugging());
-
-        ApiClient oldClient = api.getApiClient();
-
-        ApiClient newClient = new ApiClient();
-        newClient.setBasePath("http://example.com");
-        newClient.setDebugging(true);
-
-        // set api client via constructor
-        api = new PetApi(newClient);
-        assertNotNull(api.getApiClient());
-        assertEquals("http://example.com", api.getApiClient().getBasePath());
-        assertTrue(api.getApiClient().isDebugging());
-
-        // set api client via setter method
-        api.setApiClient(oldClient);
-        assertNotNull(api.getApiClient());
-        assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
-        assertFalse(api.getApiClient().isDebugging());
-    }
-
-    @Test
-    public void testCreateAndGetPet() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    /*
-    @Test
-    public void testCreateAndGetPetWithByteArray() throws Exception {
-        Pet pet = createRandomPet();
-        byte[] bytes = serializeJson(pet).getBytes();
-        api.addPetUsingByteArray(bytes);
-
-        byte[] fetchedBytes = api.petPetIdtestingByteArraytrueGet(pet.getId());
-        Pet fetched = deserializeJson(new String(fetchedBytes), Pet.class);
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    @Test
-    public void testGetPetByIdInObject() throws Exception {
-        Pet pet = new Pet();
-        pet.setId(TestUtils.nextId());
-        pet.setName("pet " + pet.getId());
-
-        Category category = new Category();
-        category.setId(TestUtils.nextId());
-        category.setName("category " + category.getId());
-        pet.setCategory(category);
-
-        pet.setStatus(Pet.StatusEnum.PENDING);
-        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1"});
-        pet.setPhotoUrls(photos);
-
-        api.addPet(pet);
-
-        InlineResponse200 fetched = api.getPetByIdInObject(pet.getId());
-        assertEquals(pet.getId(), fetched.getId());
-        assertEquals(pet.getName(), fetched.getName());
-
-        Object categoryObj = fetched.getCategory();
-        assertNotNull(categoryObj);
-        assertTrue(categoryObj instanceof Map);
-
-        Map categoryMap = (Map) categoryObj;
-        Object categoryIdObj = categoryMap.get("id");
-        assertTrue(categoryIdObj instanceof Integer);
-        Integer categoryIdInt = (Integer) categoryIdObj;
-        assertEquals(category.getId(), Long.valueOf(categoryIdInt));
-        assertEquals(category.getName(), categoryMap.get("name"));
-    }
-    */
-
-    @Test
-    public void testUpdatePet() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
-
-        api.updatePet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    @Test
-    public void testFindPetsByStatus() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"}));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-
-        assertTrue(found);
-    }
-
-    @Test
-    public void testFindPetsByTags() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("monster");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        List<Tag> tags = new ArrayList<Tag>();
-        Tag tag1 = new Tag();
-        tag1.setName("friendly");
-        tags.add(tag1);
-        pet.setTags(tags);
-
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"}));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-        assertTrue(found);
-    }
-
-    @Test
-    public void testUpdatePetWithForm() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("frank");
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-
-        api.updatePetWithForm(fetched.getId(), "furt", null);
-        Pet updated = api.getPetById(fetched.getId());
-
-        assertEquals(updated.getName(), "furt");
-    }
-
-    @Test
-    public void testDeletePet() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        api.deletePet(fetched.getId(), null);
-
-        try {
-            fetched = api.getPetById(fetched.getId());
-            fail("expected an error");
-        } catch (ApiException e) {
-            assertEquals(404, e.getCode());
-        }
-    }
-
-    @Test
-    public void testUploadFile() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        File file = new File("hello.txt");
-        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
-        writer.write("Hello world!");
-        writer.close();
-
-        api.uploadFile(pet.getId(), "a test file", new File(file.getAbsolutePath()));
-    }
-
-    @Test
-    public void testEqualsAndHashCode() {
-        Pet pet1 = new Pet();
-        Pet pet2 = new Pet();
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-
-        pet2.setName("really-happy");
-        pet2.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
-        assertFalse(pet1.equals(pet2));
-        assertFalse(pet2.equals(pet1));
-        assertFalse(pet1.hashCode() == (pet2.hashCode()));
-        assertTrue(pet2.equals(pet2));
-        assertTrue(pet2.hashCode() == pet2.hashCode());
-
-        pet1.setName("really-happy");
-        pet1.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-    }
-
-    private Pet createRandomPet() {
-        Pet pet = new Pet();
-        pet.setId(TestUtils.nextId());
-        pet.setName("gorilla");
-
-        Category category = new Category();
-        category.setName("really-happy");
-
-        pet.setCategory(category);
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"});
-        pet.setPhotoUrls(photos);
-
-        return pet;
-    }
-
-    private String serializeJson(Object o) {
-        if (mapper == null) {
-            mapper = createObjectMapper();
-        }
-        try {
-            return mapper.writeValueAsString(o);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private <T> T deserializeJson(String json, Class<T> klass) {
-        if (mapper == null) {
-            mapper = createObjectMapper();
-        }
-        try {
-            return mapper.readValue(json, klass);
-        } catch (Exception e) {
-          throw new RuntimeException(e);
-        }
-    }
-
-    private ObjectMapper createObjectMapper() {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-        mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
-        mapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
-        mapper.registerModule(new JodaModule());
-        return mapper;
-    }
-}

samples/client/petstore/java/default/src/test/java/io/swagger/client/api/StoreApiTest.java

@@ -1,103 +0,0 @@
-package io.swagger.client.api;
-
-import io.swagger.TestUtils;
-
-import io.swagger.client.ApiException;
-
-import io.swagger.client.*;
-import io.swagger.client.api.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-
-import java.lang.reflect.Field;
-import java.util.Map;
-import java.text.SimpleDateFormat;
-
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class StoreApiTest {
-    StoreApi api = null;
-
-    @Before
-    public void setup() {
-        api = new StoreApi();
-        // setup authentication
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
-        apiKeyAuth.setApiKey("special-key");
-        // set custom date format that is used by the petstore server
-        api.getApiClient().setDateFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"));
-    }
-
-    @Test
-    public void testGetInventory() throws Exception {
-        Map<String, Integer> inventory = api.getInventory();
-        assertTrue(inventory.keySet().size() > 0);
-    }
-
-    /*
-    @Test
-    public void testGetInventoryInObject() throws Exception {
-        Object inventoryObj = api.getInventoryInObject();
-        assertTrue(inventoryObj instanceof Map);
-
-        Map inventoryMap = (Map) inventoryObj;
-        assertTrue(inventoryMap.keySet().size() > 0);
-
-        Map.Entry firstEntry = (Map.Entry) inventoryMap.entrySet().iterator().next();
-        assertTrue(firstEntry.getKey() instanceof String);
-        assertTrue(firstEntry.getValue() instanceof Integer);
-    }
-    */
-
-    @Test
-    public void testPlaceOrder() throws Exception {
-        Order order = createOrder();
-        api.placeOrder(order);
-
-        Order fetched = api.getOrderById(order.getId());
-        assertEquals(order.getId(), fetched.getId());
-        assertEquals(order.getPetId(), fetched.getPetId());
-        assertEquals(order.getQuantity(), fetched.getQuantity());
-        assertEquals(order.getShipDate().withZone(DateTimeZone.UTC), fetched.getShipDate().withZone(DateTimeZone.UTC));
-    }
-
-    @Test
-    public void testDeleteOrder() throws Exception {
-        Order order = createOrder();
-        api.placeOrder(order);
-
-        Order fetched = api.getOrderById(order.getId());
-        assertEquals(fetched.getId(), order.getId());
-
-        api.deleteOrder(String.valueOf(order.getId()));
-
-        try {
-            api.getOrderById(order.getId());
-            // fail("expected an error");
-        } catch (ApiException e) {
-            // ok
-        }
-    }
-
-    private Order createOrder() {
-        Order order = new Order();
-        order.setPetId(new Long(200));
-        order.setQuantity(new Integer(13));
-        order.setShipDate(DateTime.now());
-        order.setStatus(Order.StatusEnum.PLACED);
-        order.setComplete(true);
-
-        try {
-          Field idField = Order.class.getDeclaredField("id");
-          idField.setAccessible(true);
-          idField.set(order, TestUtils.nextId());
-        } catch (Exception e) {
-          throw new RuntimeException(e);
-        }
-
-        return order;
-    }
-}

samples/client/petstore/java/default/src/test/java/io/swagger/client/api/UserApiTest.java

@@ -1,88 +0,0 @@
-package io.swagger.client.api;
-
-import io.swagger.TestUtils;
-
-import io.swagger.client.api.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-
-import java.util.Arrays;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class UserApiTest {
-    UserApi api = null;
-
-    @Before
-    public void setup() {
-        api = new UserApi();
-        // setup authentication
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
-        apiKeyAuth.setApiKey("special-key");
-    }
-
-    @Test
-    public void testCreateUser() throws Exception {
-        User user = createUser();
-
-        api.createUser(user);
-
-        User fetched = api.getUserByName(user.getUsername());
-        assertEquals(user.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testCreateUsersWithArray() throws Exception {
-        User user1 = createUser();
-        user1.setUsername("user" + user1.getId());
-        User user2 = createUser();
-        user2.setUsername("user" + user2.getId());
-
-        api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
-
-        User fetched = api.getUserByName(user1.getUsername());
-        assertEquals(user1.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testCreateUsersWithList() throws Exception {
-        User user1 = createUser();
-        user1.setUsername("user" + user1.getId());
-        User user2 = createUser();
-        user2.setUsername("user" + user2.getId());
-
-        api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
-
-        User fetched = api.getUserByName(user1.getUsername());
-        assertEquals(user1.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testLoginUser() throws Exception {
-        User user = createUser();
-        api.createUser(user);
-
-        String token = api.loginUser(user.getUsername(), user.getPassword());
-        assertTrue(token.startsWith("logged in user session:"));
-    }
-
-    @Test
-    public void logoutUser() throws Exception {
-        api.logoutUser();
-    }
-
-    private User createUser() {
-        User user = new User();
-        user.setId(TestUtils.nextId());
-        user.setUsername("fred" + user.getId());
-        user.setFirstName("Fred");
-        user.setLastName("Meyer");
-        user.setEmail("fred@fredmeyer.com");
-        user.setPassword("xxXXxx");
-        user.setPhone("408-867-5309");
-        user.setUserStatus(123);
-
-        return user;
-    }
-}

samples/client/petstore/java/default/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java

@@ -1,47 +0,0 @@
-package io.swagger.client.auth;
-
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.List;
-
-import io.swagger.client.Pair;
-import org.junit.*;
-import static org.junit.Assert.*;
-
-
-public class ApiKeyAuthTest {
-    @Test
-    public void testApplyToParamsInQuery() {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
-        auth.setApiKey("my-api-key");
-        auth.applyToParams(queryParams, headerParams);
-
-        assertEquals(1, queryParams.size());
-        for (Pair queryParam : queryParams) {
-            assertEquals("my-api-key", queryParam.getValue());
-        }
-
-        // no changes to header parameters
-        assertEquals(0, headerParams.size());
-    }
-
-    @Test
-    public void testApplyToParamsInHeaderWithPrefix() {
-            List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
-        auth.setApiKey("my-api-token");
-        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams);
-
-        // no changes to query parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(1, headerParams.size());
-        assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN"));
-    }
-}

samples/client/petstore/java/default/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java

@@ -1,52 +0,0 @@
-package io.swagger.client.auth;
-
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.List;
-
-import io.swagger.client.Pair;
-import org.junit.*;
-import static org.junit.Assert.*;
-
-
-public class HttpBasicAuthTest {
-    HttpBasicAuth auth = null;
-
-    @Before
-    public void setup() {
-        auth = new HttpBasicAuth();
-    }
-
-    @Test
-    public void testApplyToParams() {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        auth.setUsername("my-username");
-        auth.setPassword("my-password");
-        auth.applyToParams(queryParams, headerParams);
-
-        // no changes to query parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(1, headerParams.size());
-        // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix
-        String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
-        assertEquals(expected, headerParams.get("Authorization"));
-
-        // null username should be treated as empty string
-        auth.setUsername(null);
-        auth.applyToParams(queryParams, headerParams);
-        // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
-        expected = "Basic Om15LXBhc3N3b3Jk";
-        assertEquals(expected, headerParams.get("Authorization"));
-
-        // null password should be treated as empty string
-        auth.setUsername("my-username");
-        auth.setPassword(null);
-        auth.applyToParams(queryParams, headerParams);
-        // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
-        expected = "Basic bXktdXNlcm5hbWU6";
-        assertEquals(expected, headerParams.get("Authorization"));
-    }
-}

samples/client/petstore/java/feign/hello.txt

@@ -1 +0,0 @@
-Hello world!

samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java

@@ -41,10 +41,10 @@ public class ApiClient {
     this();
     for(String authName : authNames) { 
       RequestInterceptor auth;
-      if (authName == "petstore_auth") { 
-        auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
-      } else if (authName == "api_key") { 
+      if (authName == "api_key") { 
         auth = new ApiKeyAuth("header", "api_key");
+      } else if (authName == "petstore_auth") { 
+        auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
       } else {
         throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
       }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java

@@ -1,6 +1,6 @@
 /**
  * Swagger Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io

samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java

@@ -3,8 +3,8 @@ package io.swagger.client.api;
 import io.swagger.client.ApiClient;
 
 import org.joda.time.LocalDate;
-import java.math.BigDecimal;
 import org.joda.time.DateTime;
+import java.math.BigDecimal;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -39,4 +39,19 @@ public interface FakeApi extends ApiClient.Api {
     "Accept: application/xml; charset=utf-8,application/json; charset=utf-8",
   })
   void testEndpointParameters(@Param("number") BigDecimal number, @Param("_double") Double _double, @Param("string") String string, @Param("_byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("_float") Float _float, @Param("binary") byte[] binary, @Param("date") LocalDate date, @Param("dateTime") DateTime dateTime, @Param("password") String password);
+
+  /**
+   * To test enum query parameters
+   * 
+   * @param enumQueryString Query parameter enum test (string) (optional, default to -efg)
+   * @param enumQueryInteger Query parameter enum test (double) (optional)
+   * @param enumQueryDouble Query parameter enum test (double) (optional)
+   * @return void
+   */
+  @RequestLine("GET /fake?enum_query_integer={enumQueryInteger}")
+  @Headers({
+    "Content-type: application/json",
+    "Accept: application/json",
+  })
+  void testEnumQueryParameters(@Param("enumQueryString") String enumQueryString, @Param("enumQueryInteger") BigDecimal enumQueryInteger, @Param("enumQueryDouble") Double enumQueryDouble);
 }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java

@@ -3,8 +3,8 @@ package io.swagger.client.api;
 import io.swagger.client.ApiClient;
 
 import io.swagger.client.model.Pet;
-import io.swagger.client.model.ModelApiResponse;
 import java.io.File;
+import io.swagger.client.model.ModelApiResponse;
 
 import java.util.ArrayList;
 import java.util.HashMap;

samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/OAuthFlow.java

@@ -1,6 +1,6 @@
 /**
  * Swagger Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java

@@ -1,6 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -15,40 +39,44 @@ import java.util.Map;
  */
 
 public class AdditionalPropertiesClass   {
-  
+  @JsonProperty("map_property")
   private Map<String, String> mapProperty = new HashMap<String, String>();
+
+  @JsonProperty("map_of_map_property")
   private Map<String, Map<String, String>> mapOfMapProperty = new HashMap<String, Map<String, String>>();
 
-  
-  /**
-   **/
   public AdditionalPropertiesClass mapProperty(Map<String, String> mapProperty) {
     this.mapProperty = mapProperty;
     return this;
   }
-  
+
+   /**
+   * Get mapProperty
+   * @return mapProperty
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("map_property")
   public Map<String, String> getMapProperty() {
     return mapProperty;
   }
+
   public void setMapProperty(Map<String, String> mapProperty) {
     this.mapProperty = mapProperty;
   }
 
-
-  /**
-   **/
   public AdditionalPropertiesClass mapOfMapProperty(Map<String, Map<String, String>> mapOfMapProperty) {
     this.mapOfMapProperty = mapOfMapProperty;
     return this;
   }
-  
+
+   /**
+   * Get mapOfMapProperty
+   * @return mapOfMapProperty
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("map_of_map_property")
   public Map<String, Map<String, String>> getMapOfMapProperty() {
     return mapOfMapProperty;
   }
+
   public void setMapOfMapProperty(Map<String, Map<String, String>> mapOfMapProperty) {
     this.mapOfMapProperty = mapOfMapProperty;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Animal.java

@@ -1,6 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -12,40 +36,44 @@ import io.swagger.annotations.ApiModelProperty;
  */
 
 public class Animal   {
-  
+  @JsonProperty("className")
   private String className = null;
+
+  @JsonProperty("color")
   private String color = "red";
 
-  
-  /**
-   **/
   public Animal className(String className) {
     this.className = className;
     return this;
   }
-  
+
+   /**
+   * Get className
+   * @return className
+  **/
   @ApiModelProperty(example = "null", required = true, value = "")
-  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
+
   public void setClassName(String className) {
     this.className = className;
   }
 
-
-  /**
-   **/
   public Animal color(String color) {
     this.color = color;
     return this;
   }
-  
+
+   /**
+   * Get color
+   * @return color
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("color")
   public String getColor() {
     return color;
   }
+
   public void setColor(String color) {
     this.color = color;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java

@@ -1,6 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import io.swagger.client.model.Animal;
 import java.util.ArrayList;
@@ -12,9 +36,7 @@ import java.util.List;
  */
 
 public class AnimalFarm extends ArrayList<Animal>  {
-  
 
-  
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java

@@ -1,10 +1,35 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.ReadOnlyFirst;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -14,58 +39,65 @@ import java.util.List;
  */
 
 public class ArrayTest   {
-  
+  @JsonProperty("array_of_string")
   private List<String> arrayOfString = new ArrayList<String>();
+
+  @JsonProperty("array_array_of_integer")
   private List<List<Long>> arrayArrayOfInteger = new ArrayList<List<Long>>();
+
+  @JsonProperty("array_array_of_model")
   private List<List<ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
 
-  
-  /**
-   **/
   public ArrayTest arrayOfString(List<String> arrayOfString) {
     this.arrayOfString = arrayOfString;
     return this;
   }
-  
+
+   /**
+   * Get arrayOfString
+   * @return arrayOfString
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
+
   public void setArrayOfString(List<String> arrayOfString) {
     this.arrayOfString = arrayOfString;
   }
 
-
-  /**
-   **/
   public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
     this.arrayArrayOfInteger = arrayArrayOfInteger;
     return this;
   }
-  
+
+   /**
+   * Get arrayArrayOfInteger
+   * @return arrayArrayOfInteger
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
+
   public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
     this.arrayArrayOfInteger = arrayArrayOfInteger;
   }
 
-
-  /**
-   **/
   public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
     this.arrayArrayOfModel = arrayArrayOfModel;
     return this;
   }
-  
+
+   /**
+   * Get arrayArrayOfModel
+   * @return arrayArrayOfModel
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
+
   public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
     this.arrayArrayOfModel = arrayArrayOfModel;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Cat.java

@@ -1,6 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -13,58 +37,65 @@ import io.swagger.client.model.Animal;
  */
 
 public class Cat extends Animal  {
-  
+  @JsonProperty("className")
   private String className = null;
+
+  @JsonProperty("color")
   private String color = "red";
+
+  @JsonProperty("declawed")
   private Boolean declawed = null;
 
-  
-  /**
-   **/
   public Cat className(String className) {
     this.className = className;
     return this;
   }
-  
+
+   /**
+   * Get className
+   * @return className
+  **/
   @ApiModelProperty(example = "null", required = true, value = "")
-  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
+
   public void setClassName(String className) {
     this.className = className;
   }
 
-
-  /**
-   **/
   public Cat color(String color) {
     this.color = color;
     return this;
   }
-  
+
+   /**
+   * Get color
+   * @return color
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("color")
   public String getColor() {
     return color;
   }
+
   public void setColor(String color) {
     this.color = color;
   }
 
-
-  /**
-   **/
   public Cat declawed(Boolean declawed) {
     this.declawed = declawed;
     return this;
   }
-  
+
+   /**
+   * Get declawed
+   * @return declawed
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
+
   public void setDeclawed(Boolean declawed) {
     this.declawed = declawed;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java

@@ -1,6 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -12,40 +36,44 @@ import io.swagger.annotations.ApiModelProperty;
  */
 
 public class Category   {
-  
+  @JsonProperty("id")
   private Long id = null;
+
+  @JsonProperty("name")
   private String name = null;
 
-  
-  /**
-   **/
   public Category id(Long id) {
     this.id = id;
     return this;
   }
-  
+
+   /**
+   * Get id
+   * @return id
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("id")
   public Long getId() {
     return id;
   }
+
   public void setId(Long id) {
     this.id = id;
   }
 
-
-  /**
-   **/
   public Category name(String name) {
     this.name = name;
     return this;
   }
-  
+
+   /**
+   * Get name
+   * @return name
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
+
   public void setName(String name) {
     this.name = name;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Dog.java

@@ -1,6 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -13,58 +37,65 @@ import io.swagger.client.model.Animal;
  */
 
 public class Dog extends Animal  {
-  
+  @JsonProperty("className")
   private String className = null;
+
+  @JsonProperty("color")
   private String color = "red";
+
+  @JsonProperty("breed")
   private String breed = null;
 
-  
-  /**
-   **/
   public Dog className(String className) {
     this.className = className;
     return this;
   }
-  
+
+   /**
+   * Get className
+   * @return className
+  **/
   @ApiModelProperty(example = "null", required = true, value = "")
-  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
+
   public void setClassName(String className) {
     this.className = className;
   }
 
-
-  /**
-   **/
   public Dog color(String color) {
     this.color = color;
     return this;
   }
-  
+
+   /**
+   * Get color
+   * @return color
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("color")
   public String getColor() {
     return color;
   }
+
   public void setColor(String color) {
     this.color = color;
   }
 
-
-  /**
-   **/
   public Dog breed(String breed) {
     this.breed = breed;
     return this;
   }
-  
+
+   /**
+   * Get breed
+   * @return breed
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
+
   public void setBreed(String breed) {
     this.breed = breed;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumClass.java

@@ -1,16 +1,42 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonValue;
 
 
 /**
  * Gets or Sets EnumClass
  */
 public enum EnumClass {
+  
   _ABC("_abc"),
+  
   _EFG("-efg"),
+  
   _XYZ_("(xyz)");
 
   private String value;
@@ -20,7 +46,6 @@ public enum EnumClass {
   }
 
   @Override
-  @JsonValue
   public String toString() {
     return String.valueOf(value);
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java

@@ -1,9 +1,32 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -13,13 +36,12 @@ import io.swagger.annotations.ApiModelProperty;
  */
 
 public class EnumTest   {
-  
-
   /**
    * Gets or Sets enumString
    */
   public enum EnumStringEnum {
     UPPER("UPPER"),
+    
     LOWER("lower");
 
     private String value;
@@ -29,12 +51,12 @@ public class EnumTest   {
     }
 
     @Override
-    @JsonValue
     public String toString() {
       return String.valueOf(value);
     }
   }
 
+  @JsonProperty("enum_string")
   private EnumStringEnum enumString = null;
 
   /**
@@ -42,6 +64,7 @@ public class EnumTest   {
    */
   public enum EnumIntegerEnum {
     NUMBER_1(1),
+    
     NUMBER_MINUS_1(-1);
 
     private Integer value;
@@ -51,12 +74,12 @@ public class EnumTest   {
     }
 
     @Override
-    @JsonValue
     public String toString() {
       return String.valueOf(value);
     }
   }
 
+  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger = null;
 
   /**
@@ -64,6 +87,7 @@ public class EnumTest   {
    */
   public enum EnumNumberEnum {
     NUMBER_1_DOT_1(1.1),
+    
     NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
@@ -73,61 +97,64 @@ public class EnumTest   {
     }
 
     @Override
-    @JsonValue
     public String toString() {
       return String.valueOf(value);
     }
   }
 
+  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber = null;
 
-  
-  /**
-   **/
   public EnumTest enumString(EnumStringEnum enumString) {
     this.enumString = enumString;
     return this;
   }
-  
+
+   /**
+   * Get enumString
+   * @return enumString
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
+
   public void setEnumString(EnumStringEnum enumString) {
     this.enumString = enumString;
   }
 
-
-  /**
-   **/
   public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     this.enumInteger = enumInteger;
     return this;
   }
-  
+
+   /**
+   * Get enumInteger
+   * @return enumInteger
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
+
   public void setEnumInteger(EnumIntegerEnum enumInteger) {
     this.enumInteger = enumInteger;
   }
 
-
-  /**
-   **/
   public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     this.enumNumber = enumNumber;
     return this;
   }
-  
+
+   /**
+   * Get enumNumber
+   * @return enumNumber
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
+
   public void setEnumNumber(EnumNumberEnum enumNumber) {
     this.enumNumber = enumNumber;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FormatTest.java

@@ -1,6 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -15,248 +39,285 @@ import org.joda.time.LocalDate;
  */
 
 public class FormatTest   {
-  
+  @JsonProperty("integer")
   private Integer integer = null;
+
+  @JsonProperty("int32")
   private Integer int32 = null;
+
+  @JsonProperty("int64")
   private Long int64 = null;
+
+  @JsonProperty("number")
   private BigDecimal number = null;
+
+  @JsonProperty("float")
   private Float _float = null;
+
+  @JsonProperty("double")
   private Double _double = null;
+
+  @JsonProperty("string")
   private String string = null;
+
+  @JsonProperty("byte")
   private byte[] _byte = null;
+
+  @JsonProperty("binary")
   private byte[] binary = null;
+
+  @JsonProperty("date")
   private LocalDate date = null;
+
+  @JsonProperty("dateTime")
   private DateTime dateTime = null;
+
+  @JsonProperty("uuid")
   private String uuid = null;
+
+  @JsonProperty("password")
   private String password = null;
 
-  
-  /**
-   * minimum: 10.0
-   * maximum: 100.0
-   **/
   public FormatTest integer(Integer integer) {
     this.integer = integer;
     return this;
   }
-  
+
+   /**
+   * Get integer
+   * minimum: 10.0
+   * maximum: 100.0
+   * @return integer
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
+
   public void setInteger(Integer integer) {
     this.integer = integer;
   }
 
-
-  /**
-   * minimum: 20.0
-   * maximum: 200.0
-   **/
   public FormatTest int32(Integer int32) {
     this.int32 = int32;
     return this;
   }
-  
+
+   /**
+   * Get int32
+   * minimum: 20.0
+   * maximum: 200.0
+   * @return int32
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
+
   public void setInt32(Integer int32) {
     this.int32 = int32;
   }
 
-
-  /**
-   **/
   public FormatTest int64(Long int64) {
     this.int64 = int64;
     return this;
   }
-  
+
+   /**
+   * Get int64
+   * @return int64
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
+
   public void setInt64(Long int64) {
     this.int64 = int64;
   }
 
-
-  /**
-   * minimum: 32.1
-   * maximum: 543.2
-   **/
   public FormatTest number(BigDecimal number) {
     this.number = number;
     return this;
   }
-  
+
+   /**
+   * Get number
+   * minimum: 32.1
+   * maximum: 543.2
+   * @return number
+  **/
   @ApiModelProperty(example = "null", required = true, value = "")
-  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
+
   public void setNumber(BigDecimal number) {
     this.number = number;
   }
 
-
-  /**
-   * minimum: 54.3
-   * maximum: 987.6
-   **/
   public FormatTest _float(Float _float) {
     this._float = _float;
     return this;
   }
-  
+
+   /**
+   * Get _float
+   * minimum: 54.3
+   * maximum: 987.6
+   * @return _float
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
+
   public void setFloat(Float _float) {
     this._float = _float;
   }
 
-
-  /**
-   * minimum: 67.8
-   * maximum: 123.4
-   **/
   public FormatTest _double(Double _double) {
     this._double = _double;
     return this;
   }
-  
+
+   /**
+   * Get _double
+   * minimum: 67.8
+   * maximum: 123.4
+   * @return _double
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
+
   public void setDouble(Double _double) {
     this._double = _double;
   }
 
-
-  /**
-   **/
   public FormatTest string(String string) {
     this.string = string;
     return this;
   }
-  
+
+   /**
+   * Get string
+   * @return string
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("string")
   public String getString() {
     return string;
   }
+
   public void setString(String string) {
     this.string = string;
   }
 
-
-  /**
-   **/
   public FormatTest _byte(byte[] _byte) {
     this._byte = _byte;
     return this;
   }
-  
+
+   /**
+   * Get _byte
+   * @return _byte
+  **/
   @ApiModelProperty(example = "null", required = true, value = "")
-  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
+
   public void setByte(byte[] _byte) {
     this._byte = _byte;
   }
 
-
-  /**
-   **/
   public FormatTest binary(byte[] binary) {
     this.binary = binary;
     return this;
   }
-  
+
+   /**
+   * Get binary
+   * @return binary
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("binary")
   public byte[] getBinary() {
     return binary;
   }
+
   public void setBinary(byte[] binary) {
     this.binary = binary;
   }
 
-
-  /**
-   **/
   public FormatTest date(LocalDate date) {
     this.date = date;
     return this;
   }
-  
+
+   /**
+   * Get date
+   * @return date
+  **/
   @ApiModelProperty(example = "null", required = true, value = "")
-  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
+
   public void setDate(LocalDate date) {
     this.date = date;
   }
 
-
-  /**
-   **/
   public FormatTest dateTime(DateTime dateTime) {
     this.dateTime = dateTime;
     return this;
   }
-  
+
+   /**
+   * Get dateTime
+   * @return dateTime
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("dateTime")
   public DateTime getDateTime() {
     return dateTime;
   }
+
   public void setDateTime(DateTime dateTime) {
     this.dateTime = dateTime;
   }
 
-
-  /**
-   **/
   public FormatTest uuid(String uuid) {
     this.uuid = uuid;
     return this;
   }
-  
+
+   /**
+   * Get uuid
+   * @return uuid
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
+
   public void setUuid(String uuid) {
     this.uuid = uuid;
   }
 
-
-  /**
-   **/
   public FormatTest password(String password) {
     this.password = password;
     return this;
   }
-  
+
+   /**
+   * Get password
+   * @return password
+  **/
   @ApiModelProperty(example = "null", required = true, value = "")
-  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
+
   public void setPassword(String password) {
     this.password = password;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -1,6 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -17,58 +41,65 @@ import org.joda.time.DateTime;
  */
 
 public class MixedPropertiesAndAdditionalPropertiesClass   {
-  
+  @JsonProperty("uuid")
   private String uuid = null;
+
+  @JsonProperty("dateTime")
   private DateTime dateTime = null;
+
+  @JsonProperty("map")
   private Map<String, Animal> map = new HashMap<String, Animal>();
 
-  
-  /**
-   **/
   public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
     this.uuid = uuid;
     return this;
   }
-  
+
+   /**
+   * Get uuid
+   * @return uuid
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
+
   public void setUuid(String uuid) {
     this.uuid = uuid;
   }
 
-
-  /**
-   **/
   public MixedPropertiesAndAdditionalPropertiesClass dateTime(DateTime dateTime) {
     this.dateTime = dateTime;
     return this;
   }
-  
+
+   /**
+   * Get dateTime
+   * @return dateTime
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("dateTime")
   public DateTime getDateTime() {
     return dateTime;
   }
+
   public void setDateTime(DateTime dateTime) {
     this.dateTime = dateTime;
   }
 
-
-  /**
-   **/
   public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
     this.map = map;
     return this;
   }
-  
+
+   /**
+   * Get map
+   * @return map
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }
+
   public void setMap(Map<String, Animal> map) {
     this.map = map;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java

@@ -1,6 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -13,40 +37,44 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(description = "Model for testing model name starting with number")
 
 public class Model200Response   {
-  
+  @JsonProperty("name")
   private Integer name = null;
+
+  @JsonProperty("class")
   private String PropertyClass = null;
 
-  
-  /**
-   **/
   public Model200Response name(Integer name) {
     this.name = name;
     return this;
   }
-  
+
+   /**
+   * Get name
+   * @return name
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
+
   public void setName(Integer name) {
     this.name = name;
   }
 
-
-  /**
-   **/
   public Model200Response PropertyClass(String PropertyClass) {
     this.PropertyClass = PropertyClass;
     return this;
   }
-  
+
+   /**
+   * Get PropertyClass
+   * @return PropertyClass
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("class")
   public String getPropertyClass() {
     return PropertyClass;
   }
+
   public void setPropertyClass(String PropertyClass) {
     this.PropertyClass = PropertyClass;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java

@@ -1,6 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -12,58 +36,65 @@ import io.swagger.annotations.ApiModelProperty;
  */
 
 public class ModelApiResponse   {
-  
+  @JsonProperty("code")
   private Integer code = null;
+
+  @JsonProperty("type")
   private String type = null;
+
+  @JsonProperty("message")
   private String message = null;
 
-  
-  /**
-   **/
   public ModelApiResponse code(Integer code) {
     this.code = code;
     return this;
   }
-  
+
+   /**
+   * Get code
+   * @return code
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
+
   public void setCode(Integer code) {
     this.code = code;
   }
 
-
-  /**
-   **/
   public ModelApiResponse type(String type) {
     this.type = type;
     return this;
   }
-  
+
+   /**
+   * Get type
+   * @return type
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("type")
   public String getType() {
     return type;
   }
+
   public void setType(String type) {
     this.type = type;
   }
 
-
-  /**
-   **/
   public ModelApiResponse message(String message) {
     this.message = message;
     return this;
   }
-  
+
+   /**
+   * Get message
+   * @return message
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
+
   public void setMessage(String message) {
     this.message = message;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelReturn.java

@@ -1,6 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -13,22 +37,23 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(description = "Model for testing reserved words")
 
 public class ModelReturn   {
-  
+  @JsonProperty("return")
   private Integer _return = null;
 
-  
-  /**
-   **/
   public ModelReturn _return(Integer _return) {
     this._return = _return;
     return this;
   }
-  
+
+   /**
+   * Get _return
+   * @return _return
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
+
   public void setReturn(Integer _return) {
     this._return = _return;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Name.java

@@ -1,6 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -13,56 +37,68 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(description = "Model for testing model name same as property name")
 
 public class Name   {
-  
+  @JsonProperty("name")
   private Integer name = null;
+
+  @JsonProperty("snake_case")
   private Integer snakeCase = null;
+
+  @JsonProperty("property")
   private String property = null;
+
+  @JsonProperty("123Number")
   private Integer _123Number = null;
 
-  
-  /**
-   **/
   public Name name(Integer name) {
     this.name = name;
     return this;
   }
-  
+
+   /**
+   * Get name
+   * @return name
+  **/
   @ApiModelProperty(example = "null", required = true, value = "")
-  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
+
   public void setName(Integer name) {
     this.name = name;
   }
 
-
+   /**
+   * Get snakeCase
+   * @return snakeCase
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
 
-
-  /**
-   **/
   public Name property(String property) {
     this.property = property;
     return this;
   }
-  
+
+   /**
+   * Get property
+   * @return property
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
+
   public void setProperty(String property) {
     this.property = property;
   }
 
-
+   /**
+   * Get _123Number
+   * @return _123Number
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("123Number")
   public Integer get123Number() {
     return _123Number;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java

@@ -1,9 +1,32 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.joda.time.DateTime;
@@ -14,10 +37,16 @@ import org.joda.time.DateTime;
  */
 
 public class Order   {
-  
+  @JsonProperty("id")
   private Long id = null;
+
+  @JsonProperty("petId")
   private Long petId = null;
+
+  @JsonProperty("quantity")
   private Integer quantity = null;
+
+  @JsonProperty("shipDate")
   private DateTime shipDate = null;
 
   /**
@@ -25,7 +54,9 @@ public class Order   {
    */
   public enum StatusEnum {
     PLACED("placed"),
+    
     APPROVED("approved"),
+    
     DELIVERED("delivered");
 
     private String value;
@@ -35,114 +66,121 @@ public class Order   {
     }
 
     @Override
-    @JsonValue
     public String toString() {
       return String.valueOf(value);
     }
   }
 
+  @JsonProperty("status")
   private StatusEnum status = null;
+
+  @JsonProperty("complete")
   private Boolean complete = false;
 
-  
-  /**
-   **/
   public Order id(Long id) {
     this.id = id;
     return this;
   }
-  
+
+   /**
+   * Get id
+   * @return id
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("id")
   public Long getId() {
     return id;
   }
+
   public void setId(Long id) {
     this.id = id;
   }
 
-
-  /**
-   **/
   public Order petId(Long petId) {
     this.petId = petId;
     return this;
   }
-  
+
+   /**
+   * Get petId
+   * @return petId
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
+
   public void setPetId(Long petId) {
     this.petId = petId;
   }
 
-
-  /**
-   **/
   public Order quantity(Integer quantity) {
     this.quantity = quantity;
     return this;
   }
-  
+
+   /**
+   * Get quantity
+   * @return quantity
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
+
   public void setQuantity(Integer quantity) {
     this.quantity = quantity;
   }
 
-
-  /**
-   **/
   public Order shipDate(DateTime shipDate) {
     this.shipDate = shipDate;
     return this;
   }
-  
+
+   /**
+   * Get shipDate
+   * @return shipDate
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("shipDate")
   public DateTime getShipDate() {
     return shipDate;
   }
+
   public void setShipDate(DateTime shipDate) {
     this.shipDate = shipDate;
   }
 
-
-  /**
-   * Order Status
-   **/
   public Order status(StatusEnum status) {
     this.status = status;
     return this;
   }
-  
+
+   /**
+   * Order Status
+   * @return status
+  **/
   @ApiModelProperty(example = "null", value = "Order Status")
-  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
+
   public void setStatus(StatusEnum status) {
     this.status = status;
   }
 
-
-  /**
-   **/
   public Order complete(Boolean complete) {
     this.complete = complete;
     return this;
   }
-  
+
+   /**
+   * Get complete
+   * @return complete
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
+
   public void setComplete(Boolean complete) {
     this.complete = complete;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java

@@ -1,9 +1,32 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Category;
@@ -17,11 +40,19 @@ import java.util.List;
  */
 
 public class Pet   {
-  
+  @JsonProperty("id")
   private Long id = null;
+
+  @JsonProperty("category")
   private Category category = null;
+
+  @JsonProperty("name")
   private String name = null;
+
+  @JsonProperty("photoUrls")
   private List<String> photoUrls = new ArrayList<String>();
+
+  @JsonProperty("tags")
   private List<Tag> tags = new ArrayList<Tag>();
 
   /**
@@ -29,7 +60,9 @@ public class Pet   {
    */
   public enum StatusEnum {
     AVAILABLE("available"),
+    
     PENDING("pending"),
+    
     SOLD("sold");
 
     private String value;
@@ -39,113 +72,118 @@ public class Pet   {
     }
 
     @Override
-    @JsonValue
     public String toString() {
       return String.valueOf(value);
     }
   }
 
+  @JsonProperty("status")
   private StatusEnum status = null;
 
-  
-  /**
-   **/
   public Pet id(Long id) {
     this.id = id;
     return this;
   }
-  
+
+   /**
+   * Get id
+   * @return id
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("id")
   public Long getId() {
     return id;
   }
+
   public void setId(Long id) {
     this.id = id;
   }
 
-
-  /**
-   **/
   public Pet category(Category category) {
     this.category = category;
     return this;
   }
-  
+
+   /**
+   * Get category
+   * @return category
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
+
   public void setCategory(Category category) {
     this.category = category;
   }
 
-
-  /**
-   **/
   public Pet name(String name) {
     this.name = name;
     return this;
   }
-  
+
+   /**
+   * Get name
+   * @return name
+  **/
   @ApiModelProperty(example = "doggie", required = true, value = "")
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
+
   public void setName(String name) {
     this.name = name;
   }
 
-
-  /**
-   **/
   public Pet photoUrls(List<String> photoUrls) {
     this.photoUrls = photoUrls;
     return this;
   }
-  
+
+   /**
+   * Get photoUrls
+   * @return photoUrls
+  **/
   @ApiModelProperty(example = "null", required = true, value = "")
-  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
+
   public void setPhotoUrls(List<String> photoUrls) {
     this.photoUrls = photoUrls;
   }
 
-
-  /**
-   **/
   public Pet tags(List<Tag> tags) {
     this.tags = tags;
     return this;
   }
-  
+
+   /**
+   * Get tags
+   * @return tags
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("tags")
   public List<Tag> getTags() {
     return tags;
   }
+
   public void setTags(List<Tag> tags) {
     this.tags = tags;
   }
 
-
-  /**
-   * pet status in the store
-   **/
   public Pet status(StatusEnum status) {
     this.status = status;
     return this;
   }
-  
+
+   /**
+   * pet status in the store
+   * @return status
+  **/
   @ApiModelProperty(example = "null", value = "pet status in the store")
-  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
+
   public void setStatus(StatusEnum status) {
     this.status = status;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java

@@ -1,6 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -12,30 +36,35 @@ import io.swagger.annotations.ApiModelProperty;
  */
 
 public class ReadOnlyFirst   {
-  
+  @JsonProperty("bar")
   private String bar = null;
+
+  @JsonProperty("baz")
   private String baz = null;
 
-  
+   /**
+   * Get bar
+   * @return bar
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
 
-
-  /**
-   **/
   public ReadOnlyFirst baz(String baz) {
     this.baz = baz;
     return this;
   }
-  
+
+   /**
+   * Get baz
+   * @return baz
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
+
   public void setBaz(String baz) {
     this.baz = baz;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java

@@ -1,6 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -12,22 +36,23 @@ import io.swagger.annotations.ApiModelProperty;
  */
 
 public class SpecialModelName   {
-  
+  @JsonProperty("$special[property.name]")
   private Long specialPropertyName = null;
 
-  
-  /**
-   **/
   public SpecialModelName specialPropertyName(Long specialPropertyName) {
     this.specialPropertyName = specialPropertyName;
     return this;
   }
-  
+
+   /**
+   * Get specialPropertyName
+   * @return specialPropertyName
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("$special[property.name]")
   public Long getSpecialPropertyName() {
     return specialPropertyName;
   }
+
   public void setSpecialPropertyName(Long specialPropertyName) {
     this.specialPropertyName = specialPropertyName;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java

@@ -1,6 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -12,40 +36,44 @@ import io.swagger.annotations.ApiModelProperty;
  */
 
 public class Tag   {
-  
+  @JsonProperty("id")
   private Long id = null;
+
+  @JsonProperty("name")
   private String name = null;
 
-  
-  /**
-   **/
   public Tag id(Long id) {
     this.id = id;
     return this;
   }
-  
+
+   /**
+   * Get id
+   * @return id
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("id")
   public Long getId() {
     return id;
   }
+
   public void setId(Long id) {
     this.id = id;
   }
 
-
-  /**
-   **/
   public Tag name(String name) {
     this.name = name;
     return this;
   }
-  
+
+   /**
+   * Get name
+   * @return name
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
+
   public void setName(String name) {
     this.name = name;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java

@@ -1,6 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -12,149 +36,170 @@ import io.swagger.annotations.ApiModelProperty;
  */
 
 public class User   {
-  
+  @JsonProperty("id")
   private Long id = null;
+
+  @JsonProperty("username")
   private String username = null;
+
+  @JsonProperty("firstName")
   private String firstName = null;
+
+  @JsonProperty("lastName")
   private String lastName = null;
+
+  @JsonProperty("email")
   private String email = null;
+
+  @JsonProperty("password")
   private String password = null;
+
+  @JsonProperty("phone")
   private String phone = null;
+
+  @JsonProperty("userStatus")
   private Integer userStatus = null;
 
-  
-  /**
-   **/
   public User id(Long id) {
     this.id = id;
     return this;
   }
-  
+
+   /**
+   * Get id
+   * @return id
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("id")
   public Long getId() {
     return id;
   }
+
   public void setId(Long id) {
     this.id = id;
   }
 
-
-  /**
-   **/
   public User username(String username) {
     this.username = username;
     return this;
   }
-  
+
+   /**
+   * Get username
+   * @return username
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
+
   public void setUsername(String username) {
     this.username = username;
   }
 
-
-  /**
-   **/
   public User firstName(String firstName) {
     this.firstName = firstName;
     return this;
   }
-  
+
+   /**
+   * Get firstName
+   * @return firstName
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
+
   public void setFirstName(String firstName) {
     this.firstName = firstName;
   }
 
-
-  /**
-   **/
   public User lastName(String lastName) {
     this.lastName = lastName;
     return this;
   }
-  
+
+   /**
+   * Get lastName
+   * @return lastName
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
+
   public void setLastName(String lastName) {
     this.lastName = lastName;
   }
 
-
-  /**
-   **/
   public User email(String email) {
     this.email = email;
     return this;
   }
-  
+
+   /**
+   * Get email
+   * @return email
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
+
   public void setEmail(String email) {
     this.email = email;
   }
 
-
-  /**
-   **/
   public User password(String password) {
     this.password = password;
     return this;
   }
-  
+
+   /**
+   * Get password
+   * @return password
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
+
   public void setPassword(String password) {
     this.password = password;
   }
 
-
-  /**
-   **/
   public User phone(String phone) {
     this.phone = phone;
     return this;
   }
-  
+
+   /**
+   * Get phone
+   * @return phone
+  **/
   @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
+
   public void setPhone(String phone) {
     this.phone = phone;
   }
 
-
-  /**
-   * User Status
-   **/
   public User userStatus(Integer userStatus) {
     this.userStatus = userStatus;
     return this;
   }
-  
+
+   /**
+   * User Status
+   * @return userStatus
+  **/
   @ApiModelProperty(example = "null", value = "User Status")
-  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
+
   public void setUserStatus(Integer userStatus) {
     this.userStatus = userStatus;
   }

samples/client/petstore/java/jersey1/.travis.yml

@@ -0,0 +1,29 @@
+#
+# Generated by: https://github.com/swagger-api/swagger-codegen.git
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+language: java
+jdk:
+  - oraclejdk8
+  - oraclejdk7
+before_install:
+  # ensure gradlew has proper permission
+  - chmod a+x ./gradlew
+script:
+  # test using maven
+  - mvn test
+  # uncomment below to test using gradle
+  # - gradle test
+  # uncomment below to test using sbt 
+  # - sbt test

samples/client/petstore/java/jersey1/README.md

@@ -61,30 +61,32 @@ Please follow the [installation](#installation) instruction and execute the foll
 import io.swagger.client.*;
 import io.swagger.client.auth.*;
 import io.swagger.client.model.*;
-import io.swagger.client.api.PetApi;
+import io.swagger.client.api.FakeApi;
 
 import java.io.File;
 import java.util.*;
 
-public class PetApiExample {
+public class FakeApiExample {
 
     public static void main(String[] args) {
-        ApiClient defaultClient = Configuration.getDefaultApiClient();
-        
-        // Configure OAuth2 access token for authorization: petstore_auth
-        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
-        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
-        
-        
-
-        PetApi apiInstance = new PetApi();
-        
-        Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
         
+        FakeApi apiInstance = new FakeApi();
+        BigDecimal number = new BigDecimal(); // BigDecimal | None
+        Double _double = 3.4D; // Double | None
+        String string = "string_example"; // String | None
+        byte[] _byte = B; // byte[] | None
+        Integer integer = 56; // Integer | None
+        Integer int32 = 56; // Integer | None
+        Long int64 = 789L; // Long | None
+        Float _float = 3.4F; // Float | None
+        byte[] binary = B; // byte[] | None
+        LocalDate date = new LocalDate(); // LocalDate | None
+        DateTime dateTime = new DateTime(); // DateTime | None
+        String password = "password_example"; // String | None
         try {
-            apiInstance.addPet(body);
+            apiInstance.testEndpointParameters(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password);
         } catch (ApiException e) {
-            System.err.println("Exception when calling PetApi#addPet");
+            System.err.println("Exception when calling FakeApi#testEndpointParameters");
             e.printStackTrace();
         }
     }
@@ -98,21 +100,18 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
+*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**testEnumQueryParameters**](docs/FakeApi.md#testEnumQueryParameters) | **GET** /fake | To test enum query parameters
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
-*PetApi* | [**addPetUsingByteArray**](docs/PetApi.md#addPetUsingByteArray) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
 *PetApi* | [**findPetsByStatus**](docs/PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
 *PetApi* | [**findPetsByTags**](docs/PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
 *PetApi* | [**getPetById**](docs/PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
-*PetApi* | [**getPetByIdInObject**](docs/PetApi.md#getPetByIdInObject) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
-*PetApi* | [**petPetIdtestingByteArraytrueGet**](docs/PetApi.md#petPetIdtestingByteArraytrueGet) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by 'Find pet by ID'
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
-*StoreApi* | [**findOrdersByStatus**](docs/StoreApi.md#findOrdersByStatus) | **GET** /store/findByStatus | Finds orders by status
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
-*StoreApi* | [**getInventoryInObject**](docs/StoreApi.md#getInventoryInObject) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by 'Get inventory'
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID
 *StoreApi* | [**placeOrder**](docs/StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
 *UserApi* | [**createUser**](docs/UserApi.md#createUser) | **POST** /user | Create user
@@ -127,16 +126,29 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
  - [Animal](docs/Animal.md)
+ - [AnimalFarm](docs/AnimalFarm.md)
+ - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
+ - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
+ - [ArrayTest](docs/ArrayTest.md)
  - [Cat](docs/Cat.md)
  - [Category](docs/Category.md)
  - [Dog](docs/Dog.md)
- - [InlineResponse200](docs/InlineResponse200.md)
+ - [EnumClass](docs/EnumClass.md)
+ - [EnumTest](docs/EnumTest.md)
+ - [FormatTest](docs/FormatTest.md)
+ - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
+ - [MapTest](docs/MapTest.md)
+ - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
  - [Model200Response](docs/Model200Response.md)
+ - [ModelApiResponse](docs/ModelApiResponse.md)
  - [ModelReturn](docs/ModelReturn.md)
  - [Name](docs/Name.md)
+ - [NumberOnly](docs/NumberOnly.md)
  - [Order](docs/Order.md)
  - [Pet](docs/Pet.md)
+ - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
  - [User](docs/User.md)
@@ -145,6 +157,12 @@ Class | Method | HTTP request | Description
 ## Documentation for Authorization
 
 Authentication schemes defined for the API:
+### api_key
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
 ### petstore_auth
 
 - **Type**: OAuth
@@ -154,40 +172,6 @@ Authentication schemes defined for the API:
   - write:pets: modify pets in your account
   - read:pets: read your pets
 
-### test_api_client_id
-
-- **Type**: API key
-- **API key parameter name**: x-test_api_client_id
-- **Location**: HTTP header
-
-### test_api_client_secret
-
-- **Type**: API key
-- **API key parameter name**: x-test_api_client_secret
-- **Location**: HTTP header
-
-### api_key
-
-- **Type**: API key
-- **API key parameter name**: api_key
-- **Location**: HTTP header
-
-### test_http_basic
-
-- **Type**: HTTP basic authentication
-
-### test_api_key_query
-
-- **Type**: API key
-- **API key parameter name**: test_api_key_query
-- **Location**: URL query string
-
-### test_api_key_header
-
-- **Type**: API key
-- **API key parameter name**: test_api_key_header
-- **Location**: HTTP header
-
 
 ## Recommendation
 

samples/client/petstore/java/jersey1/docs/AdditionalPropertiesClass.md

@@ -0,0 +1,11 @@
+
+# AdditionalPropertiesClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**mapProperty** | **Map<String, String>** |  |  [optional]
+**mapOfMapProperty** | [**Map<String, Map<String, String>>**](Map.md) |  |  [optional]
+
+
+

samples/client/petstore/java/jersey1/docs/Animal.md

@@ -0,0 +1,11 @@
+
+# Animal
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**className** | **String** |  | 
+**color** | **String** |  |  [optional]
+
+
+

samples/client/petstore/java/jersey1/docs/AnimalFarm.md

@@ -0,0 +1,9 @@
+
+# AnimalFarm
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+

samples/client/petstore/java/jersey1/docs/ArrayOfArrayOfNumberOnly.md

@@ -0,0 +1,10 @@
+
+# ArrayOfArrayOfNumberOnly
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**arrayArrayNumber** | [**List<List<BigDecimal>>**](List.md) |  |  [optional]
+
+
+

samples/client/petstore/java/jersey1/docs/ArrayOfNumberOnly.md

@@ -0,0 +1,10 @@
+
+# ArrayOfNumberOnly
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**arrayNumber** | [**List<BigDecimal>**](BigDecimal.md) |  |  [optional]
+
+
+

samples/client/petstore/java/jersey1/docs/ArrayTest.md

@@ -0,0 +1,12 @@
+
+# ArrayTest
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**arrayOfString** | **List<String>** |  |  [optional]
+**arrayArrayOfInteger** | [**List<List<Long>>**](List.md) |  |  [optional]
+**arrayArrayOfModel** | [**List<List<ReadOnlyFirst>>**](List.md) |  |  [optional]
+
+
+

samples/client/petstore/java/jersey1/docs/Cat.md

@@ -0,0 +1,12 @@
+
+# Cat
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**className** | **String** |  | 
+**color** | **String** |  |  [optional]
+**declawed** | **Boolean** |  |  [optional]
+
+
+

samples/client/petstore/java/jersey1/docs/Category.md

@@ -0,0 +1,11 @@
+
+# Category
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Long** |  |  [optional]
+**name** | **String** |  |  [optional]
+
+
+