diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java index d1aefad32b9..be08b75624c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java @@ -17,6 +17,10 @@ package org.openapitools.codegen.languages; +import io.swagger.v3.oas.models.media.ArraySchema; +import io.swagger.v3.oas.models.media.Schema; + +import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.CliOption; import org.openapitools.codegen.CodegenConfig; import org.openapitools.codegen.CodegenConstants; @@ -25,25 +29,20 @@ import org.openapitools.codegen.CodegenType; import org.openapitools.codegen.DefaultCodegen; import org.openapitools.codegen.SupportingFile; import org.openapitools.codegen.utils.ModelUtils; -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.Operation; -import io.swagger.v3.oas.models.media.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.util.Arrays; import java.util.HashSet; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfig { private static final Logger LOGGER = LoggerFactory.getLogger(AndroidClientCodegen.class); public static final String USE_ANDROID_MAVEN_GRADLE_PLUGIN = "useAndroidMavenGradlePlugin"; public static final String ANDROID_GRADLE_VERSION = "androidGradleVersion"; public static final String ANDROID_SDK_VERSION = "androidSdkVersion"; public static final String ANDROID_BUILD_TOOLS_VERSION = "androidBuildToolsVersion"; - protected String invokerPackage = "io.swagger.client"; + protected String invokerPackage = "org.openapitools.client"; protected String groupId = "org.openapitools"; protected String artifactId = "openapi-android-client"; protected String artifactVersion = "1.0.0"; @@ -56,8 +55,8 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi protected Boolean serializableModel = false; // requestPackage and authPackage are used by the "volley" template/library - protected String requestPackage = "io.swagger.client.request"; - protected String authPackage = "io.swagger.client.auth"; + protected String requestPackage = "org.openapitools.client.request"; + protected String authPackage = "org.openapitools.client.auth"; protected String gradleWrapperPackage = "gradle.wrapper"; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; @@ -68,8 +67,8 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi modelTemplateFiles.put("model.mustache", ".java"); apiTemplateFiles.put("api.mustache", ".java"); embeddedTemplateDir = templateDir = "android"; - apiPackage = "io.swagger.client.api"; - modelPackage = "io.swagger.client.model"; + apiPackage = "org.openapitools.client.api"; + modelPackage = "org.openapitools.client.model"; setReservedWordsLowerCase( Arrays.asList( diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/android/AndroidClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/android/AndroidClientCodegenTest.java index a5fc7149a01..0dc8bf639f9 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/android/AndroidClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/android/AndroidClientCodegenTest.java @@ -17,11 +17,10 @@ package org.openapitools.codegen.android; -import org.testng.Assert; -import org.testng.annotations.Test; - import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.languages.AndroidClientCodegen; +import org.testng.Assert; +import org.testng.annotations.Test; public class AndroidClientCodegenTest { @@ -32,12 +31,12 @@ public class AndroidClientCodegenTest { Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE); Assert.assertEquals(codegen.isHideGenerationTimestamp(), true); - Assert.assertEquals(codegen.modelPackage(), "io.swagger.client.model"); - Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "io.swagger.client.model"); - Assert.assertEquals(codegen.apiPackage(), "io.swagger.client.api"); - Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "io.swagger.client.api"); - Assert.assertEquals(codegen.getInvokerPackage(), "io.swagger.client"); - Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "io.swagger.client"); + Assert.assertEquals(codegen.modelPackage(), "org.openapitools.client.model"); + Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "org.openapitools.client.model"); + Assert.assertEquals(codegen.apiPackage(), "org.openapitools.client.api"); + Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "org.openapitools.client.api"); + Assert.assertEquals(codegen.getInvokerPackage(), "org.openapitools.client"); + Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "org.openapitools.client"); } @Test diff --git a/samples/client/petstore/android/httpclient/.openapi-generator-ignore b/samples/client/petstore/android/httpclient/.openapi-generator-ignore index c5fa491b4c5..7484ee590a3 100644 --- a/samples/client/petstore/android/httpclient/.openapi-generator-ignore +++ b/samples/client/petstore/android/httpclient/.openapi-generator-ignore @@ -1,11 +1,11 @@ -# Swagger Codegen Ignore -# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator # Use this file to prevent files from being overwritten by the generator. # The patterns follow closely to .gitignore or .dockerignore. # As an example, the C# client generator defines ApiClient.cs. -# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line: +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: #ApiClient.cs # You can match any string of characters against a directory, file or extension with a single asterisk (*): diff --git a/samples/client/petstore/android/httpclient/README.md b/samples/client/petstore/android/httpclient/README.md index c160767ab08..1d1402164d2 100644 --- a/samples/client/petstore/android/httpclient/README.md +++ b/samples/client/petstore/android/httpclient/README.md @@ -1,4 +1,4 @@ -# swagger-android-client +# openapi-android-client ## Requirements @@ -26,8 +26,8 @@ Add this dependency to your project's POM: ```xml - io.swagger - swagger-android-client + org.openapitools + openapi-android-client 1.0.0 compile @@ -38,7 +38,7 @@ Add this dependency to your project's POM: Add this dependency to your project's build file: ```groovy -compile "io.swagger:swagger-android-client:1.0.0" +compile "org.openapitools:openapi-android-client:1.0.0" ``` ### Others @@ -49,7 +49,7 @@ At first generate the JAR by executing: Then manually install the following JARs: -* target/swagger-android-client-1.0.0.jar +* target/openapi-android-client-1.0.0.jar * target/lib/*.jar ## Getting Started @@ -58,13 +58,13 @@ Please follow the [installation](#installation) instruction and execute the foll ```java -import io.swagger.client.api.PetApi; +import org.openapitools.client.api.PetApi; public class PetApiExample { public static void main(String[] args) { PetApi apiInstance = new PetApi(); - Pet pet = new Pet(); // Pet | Pet object that needs to be added to the store + Pet pet = {photoUrls=[Ljava.lang.Object;@67d18ed7, name=doggie, id=0, category={name=name, id=6}, tags=[Ljava.lang.Object;@2c78d320, status=available}; // Pet | Pet object that needs to be added to the store try { apiInstance.addPet(pet); } catch (ApiException e) { diff --git a/samples/client/petstore/android/httpclient/build.gradle b/samples/client/petstore/android/httpclient/build.gradle index 298c66cccff..4796eadacae 100644 --- a/samples/client/petstore/android/httpclient/build.gradle +++ b/samples/client/petstore/android/httpclient/build.gradle @@ -1,4 +1,4 @@ -group = 'io.swagger' +group = 'org.openapitools' project.version = '1.0.0' buildscript { diff --git a/samples/client/petstore/android/httpclient/docs/PetApi.md b/samples/client/petstore/android/httpclient/docs/PetApi.md index b21568ed9b5..67c63e11918 100644 --- a/samples/client/petstore/android/httpclient/docs/PetApi.md +++ b/samples/client/petstore/android/httpclient/docs/PetApi.md @@ -23,10 +23,10 @@ Add a new pet to the store ### Example ```java // Import classes: -//import io.swagger.client.api.PetApi; +//import org.openapitools.client.api.PetApi; PetApi apiInstance = new PetApi(); -Pet pet = new Pet(); // Pet | Pet object that needs to be added to the store +Pet pet = {photoUrls=[Ljava.lang.Object;@67d18ed7, name=doggie, id=0, category={name=name, id=6}, tags=[Ljava.lang.Object;@2c78d320, status=available}; // Pet | Pet object that needs to be added to the store try { apiInstance.addPet(pet); } catch (ApiException e) { @@ -51,7 +51,7 @@ null (empty response body) ### HTTP request headers - - **Content-Type**: Not defined + - **Content-Type**: application/json, application/xml - **Accept**: Not defined @@ -63,7 +63,7 @@ Deletes a pet ### Example ```java // Import classes: -//import io.swagger.client.api.PetApi; +//import org.openapitools.client.api.PetApi; PetApi apiInstance = new PetApi(); Long petId = 56L; // Long | Pet id to delete @@ -107,7 +107,7 @@ Multiple status values can be provided with comma separated strings ### Example ```java // Import classes: -//import io.swagger.client.api.PetApi; +//import org.openapitools.client.api.PetApi; PetApi apiInstance = new PetApi(); List status = Arrays.asList("status_example"); // List | Status values that need to be considered for filter @@ -150,7 +150,7 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 ### Example ```java // Import classes: -//import io.swagger.client.api.PetApi; +//import org.openapitools.client.api.PetApi; PetApi apiInstance = new PetApi(); List tags = Arrays.asList("tags_example"); // List | Tags to filter by @@ -193,7 +193,7 @@ Returns a single pet ### Example ```java // Import classes: -//import io.swagger.client.api.PetApi; +//import org.openapitools.client.api.PetApi; PetApi apiInstance = new PetApi(); Long petId = 56L; // Long | ID of pet to return @@ -234,7 +234,7 @@ Update an existing pet ### Example ```java // Import classes: -//import io.swagger.client.api.PetApi; +//import org.openapitools.client.api.PetApi; PetApi apiInstance = new PetApi(); Pet pet = new Pet(); // Pet | Pet object that needs to be added to the store @@ -262,7 +262,7 @@ null (empty response body) ### HTTP request headers - - **Content-Type**: Not defined + - **Content-Type**: application/json, application/xml - **Accept**: Not defined @@ -274,12 +274,12 @@ Updates a pet in the store with form data ### Example ```java // Import classes: -//import io.swagger.client.api.PetApi; +//import org.openapitools.client.api.PetApi; PetApi apiInstance = new PetApi(); Long petId = 56L; // Long | ID of pet that needs to be updated -String name = "name_example"; // String | Updated name of the pet -String status = "status_example"; // String | Updated status of the pet +String name = "null"; // String | Updated name of the pet +String status = "null"; // String | Updated status of the pet try { apiInstance.updatePetWithForm(petId, name, status); } catch (ApiException e) { @@ -293,8 +293,8 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **petId** | **Long**| ID of pet that needs to be updated | - **name** | **String**| Updated name of the pet | [optional] - **status** | **String**| Updated status of the pet | [optional] + **name** | **String**| Updated name of the pet | [optional] [default to null] + **status** | **String**| Updated status of the pet | [optional] [default to null] ### Return type @@ -318,12 +318,12 @@ uploads an image ### Example ```java // Import classes: -//import io.swagger.client.api.PetApi; +//import org.openapitools.client.api.PetApi; PetApi apiInstance = new PetApi(); Long petId = 56L; // Long | ID of pet to update -String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server -File file = new File("/path/to/file"); // File | file to upload +String additionalMetadata = "null"; // String | Additional data to pass to server +File file = new File("null"); // File | file to upload try { ApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file); System.out.println(result); @@ -338,8 +338,8 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **petId** | **Long**| ID of pet to update | - **additionalMetadata** | **String**| Additional data to pass to server | [optional] - **file** | **File**| file to upload | [optional] + **additionalMetadata** | **String**| Additional data to pass to server | [optional] [default to null] + **file** | **File**| file to upload | [optional] [default to null] ### Return type diff --git a/samples/client/petstore/android/httpclient/docs/StoreApi.md b/samples/client/petstore/android/httpclient/docs/StoreApi.md index 8af27f703b2..4c19fdda570 100644 --- a/samples/client/petstore/android/httpclient/docs/StoreApi.md +++ b/samples/client/petstore/android/httpclient/docs/StoreApi.md @@ -21,7 +21,7 @@ For valid response try integer IDs with value < 1000. Anything above 1000 or ### Example ```java // Import classes: -//import io.swagger.client.api.StoreApi; +//import org.openapitools.client.api.StoreApi; StoreApi apiInstance = new StoreApi(); String orderId = "orderId_example"; // String | ID of the order that needs to be deleted @@ -63,7 +63,7 @@ Returns a map of status codes to quantities ### Example ```java // Import classes: -//import io.swagger.client.api.StoreApi; +//import org.openapitools.client.api.StoreApi; StoreApi apiInstance = new StoreApi(); try { @@ -102,7 +102,7 @@ For valid response try integer IDs with value <= 5 or > 10. Other val ### Example ```java // Import classes: -//import io.swagger.client.api.StoreApi; +//import org.openapitools.client.api.StoreApi; StoreApi apiInstance = new StoreApi(); Long orderId = 56L; // Long | ID of pet that needs to be fetched @@ -119,7 +119,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **orderId** | **Long**| ID of pet that needs to be fetched | [enum: ] + **orderId** | **Long**| ID of pet that needs to be fetched | ### Return type @@ -143,10 +143,10 @@ Place an order for a pet ### Example ```java // Import classes: -//import io.swagger.client.api.StoreApi; +//import org.openapitools.client.api.StoreApi; StoreApi apiInstance = new StoreApi(); -Order order = new Order(); // Order | order placed for purchasing the pet +Order order = {petId=6, quantity=1, id=0, shipDate=2000-01-23T04:56:07.000+00:00, complete=false, status=placed}; // Order | order placed for purchasing the pet try { Order result = apiInstance.placeOrder(order); System.out.println(result); @@ -172,6 +172,6 @@ No authorization required ### HTTP request headers - - **Content-Type**: application/json + - **Content-Type**: Not defined - **Accept**: application/xml, application/json diff --git a/samples/client/petstore/android/httpclient/docs/UserApi.md b/samples/client/petstore/android/httpclient/docs/UserApi.md index 2494056284e..e8f7c8e7615 100644 --- a/samples/client/petstore/android/httpclient/docs/UserApi.md +++ b/samples/client/petstore/android/httpclient/docs/UserApi.md @@ -25,7 +25,7 @@ This can only be done by the logged in user. ### Example ```java // Import classes: -//import io.swagger.client.api.UserApi; +//import org.openapitools.client.api.UserApi; UserApi apiInstance = new UserApi(); User user = new User(); // User | Created user object @@ -53,7 +53,7 @@ No authorization required ### HTTP request headers - - **Content-Type**: application/json + - **Content-Type**: Not defined - **Accept**: Not defined @@ -65,7 +65,7 @@ Creates list of users with given input array ### Example ```java // Import classes: -//import io.swagger.client.api.UserApi; +//import org.openapitools.client.api.UserApi; UserApi apiInstance = new UserApi(); List user = Arrays.asList(new List()); // List | List of user object @@ -105,7 +105,7 @@ Creates list of users with given input array ### Example ```java // Import classes: -//import io.swagger.client.api.UserApi; +//import org.openapitools.client.api.UserApi; UserApi apiInstance = new UserApi(); List user = Arrays.asList(new List()); // List | List of user object @@ -147,7 +147,7 @@ This can only be done by the logged in user. ### Example ```java // Import classes: -//import io.swagger.client.api.UserApi; +//import org.openapitools.client.api.UserApi; UserApi apiInstance = new UserApi(); String username = "username_example"; // String | The name that needs to be deleted @@ -187,7 +187,7 @@ Get user by user name ### Example ```java // Import classes: -//import io.swagger.client.api.UserApi; +//import org.openapitools.client.api.UserApi; UserApi apiInstance = new UserApi(); String username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing. @@ -228,7 +228,7 @@ Logs user into the system ### Example ```java // Import classes: -//import io.swagger.client.api.UserApi; +//import org.openapitools.client.api.UserApi; UserApi apiInstance = new UserApi(); String username = "username_example"; // String | The user name for login @@ -271,7 +271,7 @@ Logs out current logged in user session ### Example ```java // Import classes: -//import io.swagger.client.api.UserApi; +//import org.openapitools.client.api.UserApi; UserApi apiInstance = new UserApi(); try { @@ -309,11 +309,11 @@ This can only be done by the logged in user. ### Example ```java // Import classes: -//import io.swagger.client.api.UserApi; +//import org.openapitools.client.api.UserApi; UserApi apiInstance = new UserApi(); String username = "username_example"; // String | name that need to be deleted -User user = new User(); // User | Updated user object +User user = {firstName=firstName, lastName=lastName, password=password, userStatus=6, phone=phone, id=0, email=email, username=username}; // User | Updated user object try { apiInstance.updateUser(username, user); } catch (ApiException e) { @@ -339,6 +339,6 @@ No authorization required ### HTTP request headers - - **Content-Type**: application/json + - **Content-Type**: Not defined - **Accept**: Not defined diff --git a/samples/client/petstore/android/httpclient/git_push.sh b/samples/client/petstore/android/httpclient/git_push.sh index 160f6f21399..20057f67ade 100644 --- a/samples/client/petstore/android/httpclient/git_push.sh +++ b/samples/client/petstore/android/httpclient/git_push.sh @@ -1,7 +1,7 @@ #!/bin/sh # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/ # -# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update" +# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" git_user_id=$1 git_repo_id=$2 diff --git a/samples/client/petstore/android/httpclient/pom.xml b/samples/client/petstore/android/httpclient/pom.xml index 0ec1b68e2e0..981fbebda68 100644 --- a/samples/client/petstore/android/httpclient/pom.xml +++ b/samples/client/petstore/android/httpclient/pom.xml @@ -1,15 +1,15 @@ 4.0.0 - io.swagger - swagger-android-client + org.openapitools + openapi-android-client jar - swagger-android-client + openapi-android-client 1.0.0 - scm:git:git@github.com:swagger-api/swagger-mustache.git - scm:git:git@github.com:swagger-api/swagger-codegen.git - https://github.com/swagger-api/swagger-codegen + scm:git:git@github.com:openapitools/openapi-generator.git + scm:git:git@github.com:openapitools/openapi-generator.git + https://openapi-generator.tech diff --git a/samples/client/petstore/android/httpclient/settings.gradle b/samples/client/petstore/android/httpclient/settings.gradle index 599d6882189..666307984ab 100644 --- a/samples/client/petstore/android/httpclient/settings.gradle +++ b/samples/client/petstore/android/httpclient/settings.gradle @@ -1 +1 @@ -rootProject.name = "swagger-android-client" +rootProject.name = "openapi-android-client" diff --git a/samples/client/petstore/android/httpclient/src/main/AndroidManifest.xml b/samples/client/petstore/android/httpclient/src/main/AndroidManifest.xml index 3042699fd86..5b701913d24 100644 --- a/samples/client/petstore/android/httpclient/src/main/AndroidManifest.xml +++ b/samples/client/petstore/android/httpclient/src/main/AndroidManifest.xml @@ -1,3 +1,3 @@ - + diff --git a/samples/client/petstore/android/httpclient/src/main/java/gradle/wrapper/gradle-wrapper.jar b/samples/client/petstore/android/httpclient/src/main/java/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 008a64a2444..00000000000 --- a/samples/client/petstore/android/httpclient/src/main/java/gradle/wrapper/gradle-wrapper.jar +++ /dev/null @@ -1,53 +0,0 @@ -" zip.vim version v27 -" Browsing zipfile /Users/huangzhenjun/Public/git/PartTime/swagger-codegen/samples/client/petstore/android/httpclient/gradle/wrapper/gradle-wrapper.jar -" Select a file with cursor and press ENTER - -META-INF/ -META-INF/MANIFEST.MF -org/ -org/gradle/ -org/gradle/wrapper/ -org/gradle/wrapper/Download$1.class -org/gradle/wrapper/Download$SystemPropertiesProxyAuthenticator.class -org/gradle/wrapper/IDownload.class -org/gradle/wrapper/GradleUserHomeLookup.class -org/gradle/wrapper/ExclusiveFileAccessManager.class -org/gradle/wrapper/WrapperConfiguration.class -org/gradle/wrapper/SystemPropertiesHandler.class -org/gradle/wrapper/Logger.class -org/gradle/wrapper/PathAssembler.class -org/gradle/wrapper/Install.class -org/gradle/wrapper/BootstrapMainStarter.class -org/gradle/wrapper/WrapperExecutor.class -org/gradle/wrapper/GradleWrapperMain.class -org/gradle/wrapper/Install$1.class -org/gradle/wrapper/PathAssembler$LocalDistribution.class -org/gradle/wrapper/Download.class -gradle-wrapper-classpath.properties -build-receipt.properties -org/gradle/cli/ -org/gradle/cli/AbstractCommandLineConverter.class -org/gradle/cli/CommandLineParser$1.class -org/gradle/cli/CommandLineParser$MissingOptionArgState.class -org/gradle/cli/CommandLineParser$OptionStringComparator.class -org/gradle/cli/CommandLineArgumentException.class -org/gradle/cli/CommandLineParser$KnownOptionParserState.class -org/gradle/cli/CommandLineParser$OptionComparator.class -org/gradle/cli/CommandLineParser$UnknownOptionParserState.class -org/gradle/cli/CommandLineOption.class -org/gradle/cli/CommandLineParser$OptionParserState.class -org/gradle/cli/ParsedCommandLine.class -org/gradle/cli/ProjectPropertiesCommandLineConverter.class -org/gradle/cli/CommandLineParser$CaseInsensitiveStringComparator.class -org/gradle/cli/CommandLineParser.class -org/gradle/cli/CommandLineParser$AfterOptions.class -org/gradle/cli/CommandLineParser$OptionString.class -org/gradle/cli/AbstractPropertiesCommandLineConverter.class -org/gradle/cli/ParsedCommandLineOption.class -org/gradle/cli/CommandLineParser$OptionAwareParserState.class -org/gradle/cli/CommandLineConverter.class -org/gradle/cli/CommandLineParser$BeforeFirstSubCommand.class -org/gradle/cli/SystemPropertiesCommandLineConverter.class -org/gradle/cli/CommandLineParser$ParserState.class -org/gradle/cli/CommandLineParser$AfterFirstSubCommand.class -gradle-cli-classpath.properties diff --git a/samples/client/petstore/android/httpclient/src/main/java/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/android/httpclient/src/main/java/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index fa452523ac0..00000000000 --- a/samples/client/petstore/android/httpclient/src/main/java/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Mon May 16 21:00:11 CST 2016 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip diff --git a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/ApiException.java b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/ApiException.java similarity index 84% rename from samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/ApiException.java rename to samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/ApiException.java index 08d174c8318..810dc2633e6 100644 --- a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/ApiException.java +++ b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/ApiException.java @@ -5,12 +5,12 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client; +package org.openapitools.client; public class ApiException extends Exception { int code = 0; diff --git a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/ApiInvoker.java similarity index 98% rename from samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/ApiInvoker.java rename to samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/ApiInvoker.java index 4d0076afb90..6900f36e442 100644 --- a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/ApiInvoker.java +++ b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/ApiInvoker.java @@ -5,12 +5,12 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client; +package org.openapitools.client; import org.apache.http.*; import org.apache.http.client.*; @@ -95,7 +95,7 @@ public class ApiInvoker { DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); // Set default User-Agent. - setUserAgent("Swagger-Codegen/1.0.0/android"); + setUserAgent("OpenAPI-Generator/1.0.0/android"); } public static void setUserAgent(String userAgent) { diff --git a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/HttpPatch.java b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/HttpPatch.java similarity index 81% rename from samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/HttpPatch.java rename to samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/HttpPatch.java index 460a373982a..41d7756d8ff 100644 --- a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/HttpPatch.java +++ b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/HttpPatch.java @@ -5,12 +5,12 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client; +package org.openapitools.client; import org.apache.http.client.methods.*; diff --git a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/JsonUtil.java b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/JsonUtil.java similarity index 97% rename from samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/JsonUtil.java rename to samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/JsonUtil.java index 7234a4867df..b603422c4e3 100644 --- a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/JsonUtil.java +++ b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/JsonUtil.java @@ -1,11 +1,11 @@ -package io.swagger.client; +package org.openapitools.client; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; import java.util.List; -import io.swagger.client.model.*; +import org.openapitools.client.model.*; public class JsonUtil { public static GsonBuilder gsonBuilder; diff --git a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/Pair.java b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/Pair.java similarity index 87% rename from samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/Pair.java rename to samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/Pair.java index b86b8466e54..20290bcf360 100644 --- a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/Pair.java +++ b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/Pair.java @@ -5,12 +5,12 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client; +package org.openapitools.client; public class Pair { private String name = ""; diff --git a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/api/PetApi.java similarity index 96% rename from samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/api/PetApi.java rename to samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/api/PetApi.java index 8bb5d414f5a..c8846c2b265 100644 --- a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/api/PetApi.java @@ -5,24 +5,24 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.api; +package org.openapitools.client.api; -import io.swagger.client.ApiException; -import io.swagger.client.ApiInvoker; -import io.swagger.client.Pair; +import org.openapitools.client.ApiException; +import org.openapitools.client.ApiInvoker; +import org.openapitools.client.Pair; -import io.swagger.client.model.*; +import org.openapitools.client.model.*; import java.util.*; -import io.swagger.client.model.ApiResponse; +import org.openapitools.client.model.ApiResponse; import java.io.File; -import io.swagger.client.model.Pet; +import org.openapitools.client.model.Pet; import org.apache.http.entity.mime.MultipartEntityBuilder; @@ -76,7 +76,7 @@ public class PetApi { String[] localVarContentTypes = { - + "application/json","application/xml" }; String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json"; @@ -340,7 +340,7 @@ public class PetApi { String[] localVarContentTypes = { - + "application/json","application/xml" }; String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json"; diff --git a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/api/StoreApi.java similarity index 95% rename from samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/api/StoreApi.java rename to samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/api/StoreApi.java index 97008abffe4..93b89daaca9 100644 --- a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/api/StoreApi.java @@ -5,23 +5,23 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.api; +package org.openapitools.client.api; -import io.swagger.client.ApiException; -import io.swagger.client.ApiInvoker; -import io.swagger.client.Pair; +import org.openapitools.client.ApiException; +import org.openapitools.client.ApiInvoker; +import org.openapitools.client.Pair; -import io.swagger.client.model.*; +import org.openapitools.client.model.*; import java.util.*; import java.util.Map; -import io.swagger.client.model.Order; +import org.openapitools.client.model.Order; import org.apache.http.entity.mime.MultipartEntityBuilder; @@ -226,7 +226,7 @@ public class StoreApi { String[] localVarContentTypes = { - "application/json" + }; String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json"; diff --git a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/api/UserApi.java similarity index 97% rename from samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/api/UserApi.java rename to samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/api/UserApi.java index 8cc265f87ce..06640ef457d 100644 --- a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/api/UserApi.java @@ -5,23 +5,23 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.api; +package org.openapitools.client.api; -import io.swagger.client.ApiException; -import io.swagger.client.ApiInvoker; -import io.swagger.client.Pair; +import org.openapitools.client.ApiException; +import org.openapitools.client.ApiInvoker; +import org.openapitools.client.Pair; -import io.swagger.client.model.*; +import org.openapitools.client.model.*; import java.util.*; import java.util.*; -import io.swagger.client.model.User; +import org.openapitools.client.model.User; import org.apache.http.entity.mime.MultipartEntityBuilder; @@ -75,7 +75,7 @@ public class UserApi { String[] localVarContentTypes = { - "application/json" + }; String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json"; @@ -446,7 +446,7 @@ public class UserApi { String[] localVarContentTypes = { - "application/json" + }; String localVarContentType = localVarContentTypes.length > 0 ? localVarContentTypes[0] : "application/json"; diff --git a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/model/ApiResponse.java b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/model/ApiResponse.java similarity index 98% rename from samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/model/ApiResponse.java rename to samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/model/ApiResponse.java index 7204e72e363..8c33d47861e 100644 --- a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/model/ApiResponse.java +++ b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/model/ApiResponse.java @@ -1,4 +1,4 @@ -package io.swagger.client.model; +package org.openapitools.client.model; import io.swagger.annotations.*; diff --git a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/model/Category.java similarity index 97% rename from samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/model/Category.java rename to samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/model/Category.java index 22ddf3c3148..c6e1176a6c5 100644 --- a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/model/Category.java +++ b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/model/Category.java @@ -1,4 +1,4 @@ -package io.swagger.client.model; +package org.openapitools.client.model; import io.swagger.annotations.*; diff --git a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/model/Order.java similarity index 97% rename from samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/model/Order.java rename to samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/model/Order.java index 45614fde185..f029ac3d5f1 100644 --- a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/model/Order.java +++ b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/model/Order.java @@ -1,4 +1,4 @@ -package io.swagger.client.model; +package org.openapitools.client.model; import java.util.Date; @@ -26,7 +26,7 @@ public class Order { @SerializedName("status") private StatusEnum status = null; @SerializedName("complete") - private Boolean complete = null; + private Boolean complete = false; /** **/ diff --git a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/model/Pet.java similarity index 96% rename from samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/model/Pet.java rename to samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/model/Pet.java index 6b9df4659eb..a0fa97df198 100644 --- a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/model/Pet.java @@ -1,8 +1,8 @@ -package io.swagger.client.model; +package org.openapitools.client.model; -import io.swagger.client.model.Category; -import io.swagger.client.model.Tag; import java.util.*; +import org.openapitools.client.model.Category; +import org.openapitools.client.model.Tag; import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; diff --git a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/model/Tag.java similarity index 97% rename from samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/model/Tag.java rename to samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/model/Tag.java index cb0b15af38d..b0bcea3dcd5 100644 --- a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/model/Tag.java +++ b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/model/Tag.java @@ -1,4 +1,4 @@ -package io.swagger.client.model; +package org.openapitools.client.model; import io.swagger.annotations.*; diff --git a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/model/User.java similarity index 99% rename from samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/model/User.java rename to samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/model/User.java index 92ea162a005..e1306e3efcc 100644 --- a/samples/client/petstore/android/httpclient/src/main/java/io/swagger/client/model/User.java +++ b/samples/client/petstore/android/httpclient/src/main/java/org/openapitools/client/model/User.java @@ -1,4 +1,4 @@ -package io.swagger.client.model; +package org.openapitools.client.model; import io.swagger.annotations.*; diff --git a/samples/client/petstore/android/volley/.openapi-generator-ignore b/samples/client/petstore/android/volley/.openapi-generator-ignore index c5fa491b4c5..7484ee590a3 100644 --- a/samples/client/petstore/android/volley/.openapi-generator-ignore +++ b/samples/client/petstore/android/volley/.openapi-generator-ignore @@ -1,11 +1,11 @@ -# Swagger Codegen Ignore -# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator # Use this file to prevent files from being overwritten by the generator. # The patterns follow closely to .gitignore or .dockerignore. # As an example, the C# client generator defines ApiClient.cs. -# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line: +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: #ApiClient.cs # You can match any string of characters against a directory, file or extension with a single asterisk (*): diff --git a/samples/client/petstore/android/volley/README.md b/samples/client/petstore/android/volley/README.md index fcac5d480de..c06dd200808 100644 --- a/samples/client/petstore/android/volley/README.md +++ b/samples/client/petstore/android/volley/README.md @@ -1,4 +1,4 @@ -# swagger-petstore-android-volley +# petstore-android-volley ## Requirements @@ -26,8 +26,8 @@ Add this dependency to your project's POM: ```xml - io.swagger - swagger-petstore-android-volley + org.openapitools + petstore-android-volley 1.0.0 compile @@ -38,7 +38,7 @@ Add this dependency to your project's POM: Add this dependency to your project's build file: ```groovy -compile "io.swagger:swagger-petstore-android-volley:1.0.0" +compile "org.openapitools:petstore-android-volley:1.0.0" ``` ### Others @@ -49,7 +49,7 @@ At first generate the JAR by executing: Then manually install the following JARs: -* target/swagger-petstore-android-volley-1.0.0.jar +* target/petstore-android-volley-1.0.0.jar * target/lib/*.jar ## Getting Started @@ -58,13 +58,13 @@ Please follow the [installation](#installation) instruction and execute the foll ```java -import io.swagger.client.api.PetApi; +import org.openapitools.client.api.PetApi; public class PetApiExample { public static void main(String[] args) { PetApi apiInstance = new PetApi(); - Pet pet = new Pet(); // Pet | Pet object that needs to be added to the store + Pet pet = {photoUrls=[Ljava.lang.Object;@5f9be66c, name=doggie, id=0, category={name=name, id=6}, tags=[Ljava.lang.Object;@3abada5a, status=available}; // Pet | Pet object that needs to be added to the store try { apiInstance.addPet(pet); } catch (ApiException e) { diff --git a/samples/client/petstore/android/volley/build.gradle b/samples/client/petstore/android/volley/build.gradle index 04ee2bd4f4f..b820f6e5313 100644 --- a/samples/client/petstore/android/volley/build.gradle +++ b/samples/client/petstore/android/volley/build.gradle @@ -1,4 +1,4 @@ -group = 'io.swagger' +group = 'org.openapitools' project.version = '1.0.0' buildscript { diff --git a/samples/client/petstore/android/volley/docs/PetApi.md b/samples/client/petstore/android/volley/docs/PetApi.md index b21568ed9b5..e2474bb847b 100644 --- a/samples/client/petstore/android/volley/docs/PetApi.md +++ b/samples/client/petstore/android/volley/docs/PetApi.md @@ -23,10 +23,10 @@ Add a new pet to the store ### Example ```java // Import classes: -//import io.swagger.client.api.PetApi; +//import org.openapitools.client.api.PetApi; PetApi apiInstance = new PetApi(); -Pet pet = new Pet(); // Pet | Pet object that needs to be added to the store +Pet pet = {photoUrls=[Ljava.lang.Object;@5f9be66c, name=doggie, id=0, category={name=name, id=6}, tags=[Ljava.lang.Object;@3abada5a, status=available}; // Pet | Pet object that needs to be added to the store try { apiInstance.addPet(pet); } catch (ApiException e) { @@ -51,7 +51,7 @@ null (empty response body) ### HTTP request headers - - **Content-Type**: Not defined + - **Content-Type**: application/json, application/xml - **Accept**: Not defined @@ -63,7 +63,7 @@ Deletes a pet ### Example ```java // Import classes: -//import io.swagger.client.api.PetApi; +//import org.openapitools.client.api.PetApi; PetApi apiInstance = new PetApi(); Long petId = 56L; // Long | Pet id to delete @@ -107,7 +107,7 @@ Multiple status values can be provided with comma separated strings ### Example ```java // Import classes: -//import io.swagger.client.api.PetApi; +//import org.openapitools.client.api.PetApi; PetApi apiInstance = new PetApi(); List status = Arrays.asList("status_example"); // List | Status values that need to be considered for filter @@ -150,7 +150,7 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 ### Example ```java // Import classes: -//import io.swagger.client.api.PetApi; +//import org.openapitools.client.api.PetApi; PetApi apiInstance = new PetApi(); List tags = Arrays.asList("tags_example"); // List | Tags to filter by @@ -193,7 +193,7 @@ Returns a single pet ### Example ```java // Import classes: -//import io.swagger.client.api.PetApi; +//import org.openapitools.client.api.PetApi; PetApi apiInstance = new PetApi(); Long petId = 56L; // Long | ID of pet to return @@ -234,7 +234,7 @@ Update an existing pet ### Example ```java // Import classes: -//import io.swagger.client.api.PetApi; +//import org.openapitools.client.api.PetApi; PetApi apiInstance = new PetApi(); Pet pet = new Pet(); // Pet | Pet object that needs to be added to the store @@ -262,7 +262,7 @@ null (empty response body) ### HTTP request headers - - **Content-Type**: Not defined + - **Content-Type**: application/json, application/xml - **Accept**: Not defined @@ -274,12 +274,12 @@ Updates a pet in the store with form data ### Example ```java // Import classes: -//import io.swagger.client.api.PetApi; +//import org.openapitools.client.api.PetApi; PetApi apiInstance = new PetApi(); Long petId = 56L; // Long | ID of pet that needs to be updated -String name = "name_example"; // String | Updated name of the pet -String status = "status_example"; // String | Updated status of the pet +String name = "null"; // String | Updated name of the pet +String status = "null"; // String | Updated status of the pet try { apiInstance.updatePetWithForm(petId, name, status); } catch (ApiException e) { @@ -293,8 +293,8 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **petId** | **Long**| ID of pet that needs to be updated | - **name** | **String**| Updated name of the pet | [optional] - **status** | **String**| Updated status of the pet | [optional] + **name** | **String**| Updated name of the pet | [optional] [default to null] + **status** | **String**| Updated status of the pet | [optional] [default to null] ### Return type @@ -318,12 +318,12 @@ uploads an image ### Example ```java // Import classes: -//import io.swagger.client.api.PetApi; +//import org.openapitools.client.api.PetApi; PetApi apiInstance = new PetApi(); Long petId = 56L; // Long | ID of pet to update -String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server -File file = new File("/path/to/file"); // File | file to upload +String additionalMetadata = "null"; // String | Additional data to pass to server +File file = new File("null"); // File | file to upload try { ApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file); System.out.println(result); @@ -338,8 +338,8 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **petId** | **Long**| ID of pet to update | - **additionalMetadata** | **String**| Additional data to pass to server | [optional] - **file** | **File**| file to upload | [optional] + **additionalMetadata** | **String**| Additional data to pass to server | [optional] [default to null] + **file** | **File**| file to upload | [optional] [default to null] ### Return type diff --git a/samples/client/petstore/android/volley/docs/StoreApi.md b/samples/client/petstore/android/volley/docs/StoreApi.md index 8af27f703b2..4c19fdda570 100644 --- a/samples/client/petstore/android/volley/docs/StoreApi.md +++ b/samples/client/petstore/android/volley/docs/StoreApi.md @@ -21,7 +21,7 @@ For valid response try integer IDs with value < 1000. Anything above 1000 or ### Example ```java // Import classes: -//import io.swagger.client.api.StoreApi; +//import org.openapitools.client.api.StoreApi; StoreApi apiInstance = new StoreApi(); String orderId = "orderId_example"; // String | ID of the order that needs to be deleted @@ -63,7 +63,7 @@ Returns a map of status codes to quantities ### Example ```java // Import classes: -//import io.swagger.client.api.StoreApi; +//import org.openapitools.client.api.StoreApi; StoreApi apiInstance = new StoreApi(); try { @@ -102,7 +102,7 @@ For valid response try integer IDs with value <= 5 or > 10. Other val ### Example ```java // Import classes: -//import io.swagger.client.api.StoreApi; +//import org.openapitools.client.api.StoreApi; StoreApi apiInstance = new StoreApi(); Long orderId = 56L; // Long | ID of pet that needs to be fetched @@ -119,7 +119,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **orderId** | **Long**| ID of pet that needs to be fetched | [enum: ] + **orderId** | **Long**| ID of pet that needs to be fetched | ### Return type @@ -143,10 +143,10 @@ Place an order for a pet ### Example ```java // Import classes: -//import io.swagger.client.api.StoreApi; +//import org.openapitools.client.api.StoreApi; StoreApi apiInstance = new StoreApi(); -Order order = new Order(); // Order | order placed for purchasing the pet +Order order = {petId=6, quantity=1, id=0, shipDate=2000-01-23T04:56:07.000+00:00, complete=false, status=placed}; // Order | order placed for purchasing the pet try { Order result = apiInstance.placeOrder(order); System.out.println(result); @@ -172,6 +172,6 @@ No authorization required ### HTTP request headers - - **Content-Type**: application/json + - **Content-Type**: Not defined - **Accept**: application/xml, application/json diff --git a/samples/client/petstore/android/volley/docs/UserApi.md b/samples/client/petstore/android/volley/docs/UserApi.md index 2494056284e..e8f7c8e7615 100644 --- a/samples/client/petstore/android/volley/docs/UserApi.md +++ b/samples/client/petstore/android/volley/docs/UserApi.md @@ -25,7 +25,7 @@ This can only be done by the logged in user. ### Example ```java // Import classes: -//import io.swagger.client.api.UserApi; +//import org.openapitools.client.api.UserApi; UserApi apiInstance = new UserApi(); User user = new User(); // User | Created user object @@ -53,7 +53,7 @@ No authorization required ### HTTP request headers - - **Content-Type**: application/json + - **Content-Type**: Not defined - **Accept**: Not defined @@ -65,7 +65,7 @@ Creates list of users with given input array ### Example ```java // Import classes: -//import io.swagger.client.api.UserApi; +//import org.openapitools.client.api.UserApi; UserApi apiInstance = new UserApi(); List user = Arrays.asList(new List()); // List | List of user object @@ -105,7 +105,7 @@ Creates list of users with given input array ### Example ```java // Import classes: -//import io.swagger.client.api.UserApi; +//import org.openapitools.client.api.UserApi; UserApi apiInstance = new UserApi(); List user = Arrays.asList(new List()); // List | List of user object @@ -147,7 +147,7 @@ This can only be done by the logged in user. ### Example ```java // Import classes: -//import io.swagger.client.api.UserApi; +//import org.openapitools.client.api.UserApi; UserApi apiInstance = new UserApi(); String username = "username_example"; // String | The name that needs to be deleted @@ -187,7 +187,7 @@ Get user by user name ### Example ```java // Import classes: -//import io.swagger.client.api.UserApi; +//import org.openapitools.client.api.UserApi; UserApi apiInstance = new UserApi(); String username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing. @@ -228,7 +228,7 @@ Logs user into the system ### Example ```java // Import classes: -//import io.swagger.client.api.UserApi; +//import org.openapitools.client.api.UserApi; UserApi apiInstance = new UserApi(); String username = "username_example"; // String | The user name for login @@ -271,7 +271,7 @@ Logs out current logged in user session ### Example ```java // Import classes: -//import io.swagger.client.api.UserApi; +//import org.openapitools.client.api.UserApi; UserApi apiInstance = new UserApi(); try { @@ -309,11 +309,11 @@ This can only be done by the logged in user. ### Example ```java // Import classes: -//import io.swagger.client.api.UserApi; +//import org.openapitools.client.api.UserApi; UserApi apiInstance = new UserApi(); String username = "username_example"; // String | name that need to be deleted -User user = new User(); // User | Updated user object +User user = {firstName=firstName, lastName=lastName, password=password, userStatus=6, phone=phone, id=0, email=email, username=username}; // User | Updated user object try { apiInstance.updateUser(username, user); } catch (ApiException e) { @@ -339,6 +339,6 @@ No authorization required ### HTTP request headers - - **Content-Type**: application/json + - **Content-Type**: Not defined - **Accept**: Not defined diff --git a/samples/client/petstore/android/volley/git_push.sh b/samples/client/petstore/android/volley/git_push.sh index 34c19967c7a..0f406ef7878 100644 --- a/samples/client/petstore/android/volley/git_push.sh +++ b/samples/client/petstore/android/volley/git_push.sh @@ -1,7 +1,7 @@ #!/bin/sh # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/ # -# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update" +# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" git_user_id=$1 git_repo_id=$2 diff --git a/samples/client/petstore/android/volley/gradlew b/samples/client/petstore/android/volley/gradlew old mode 100755 new mode 100644 diff --git a/samples/client/petstore/android/volley/pom.xml b/samples/client/petstore/android/volley/pom.xml index 817ea4c0652..5c66c4ea568 100644 --- a/samples/client/petstore/android/volley/pom.xml +++ b/samples/client/petstore/android/volley/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - io.swagger - swagger-petstore-android-volley + org.openapitools + petstore-android-volley 1.0.0 diff --git a/samples/client/petstore/android/volley/src/main/AndroidManifest.xml b/samples/client/petstore/android/volley/src/main/AndroidManifest.xml index 29c1d7cad36..90fc37cd891 100644 --- a/samples/client/petstore/android/volley/src/main/AndroidManifest.xml +++ b/samples/client/petstore/android/volley/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ - + diff --git a/samples/client/petstore/android/volley/src/main/java/gradle/wrapper/gradle-wrapper.jar b/samples/client/petstore/android/volley/src/main/java/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 126985b8a44..00000000000 --- a/samples/client/petstore/android/volley/src/main/java/gradle/wrapper/gradle-wrapper.jar +++ /dev/null @@ -1,53 +0,0 @@ -" zip.vim version v27 -" Browsing zipfile /Users/huangzhenjun/Public/git/PartTime/swagger-codegen/samples/client/petstore/android/volley/gradle/wrapper/gradle-wrapper.jar -" Select a file with cursor and press ENTER - -META-INF/ -META-INF/MANIFEST.MF -org/ -org/gradle/ -org/gradle/wrapper/ -org/gradle/wrapper/Download$1.class -org/gradle/wrapper/Download$SystemPropertiesProxyAuthenticator.class -org/gradle/wrapper/IDownload.class -org/gradle/wrapper/GradleUserHomeLookup.class -org/gradle/wrapper/ExclusiveFileAccessManager.class -org/gradle/wrapper/WrapperConfiguration.class -org/gradle/wrapper/SystemPropertiesHandler.class -org/gradle/wrapper/Logger.class -org/gradle/wrapper/PathAssembler.class -org/gradle/wrapper/Install.class -org/gradle/wrapper/BootstrapMainStarter.class -org/gradle/wrapper/WrapperExecutor.class -org/gradle/wrapper/GradleWrapperMain.class -org/gradle/wrapper/Install$1.class -org/gradle/wrapper/PathAssembler$LocalDistribution.class -org/gradle/wrapper/Download.class -gradle-wrapper-classpath.properties -build-receipt.properties -org/gradle/cli/ -org/gradle/cli/AbstractCommandLineConverter.class -org/gradle/cli/CommandLineParser$1.class -org/gradle/cli/CommandLineParser$MissingOptionArgState.class -org/gradle/cli/CommandLineParser$OptionStringComparator.class -org/gradle/cli/CommandLineArgumentException.class -org/gradle/cli/CommandLineParser$KnownOptionParserState.class -org/gradle/cli/CommandLineParser$OptionComparator.class -org/gradle/cli/CommandLineParser$UnknownOptionParserState.class -org/gradle/cli/CommandLineOption.class -org/gradle/cli/CommandLineParser$OptionParserState.class -org/gradle/cli/ParsedCommandLine.class -org/gradle/cli/ProjectPropertiesCommandLineConverter.class -org/gradle/cli/CommandLineParser$CaseInsensitiveStringComparator.class -org/gradle/cli/CommandLineParser.class -org/gradle/cli/CommandLineParser$AfterOptions.class -org/gradle/cli/CommandLineParser$OptionString.class -org/gradle/cli/AbstractPropertiesCommandLineConverter.class -org/gradle/cli/ParsedCommandLineOption.class -org/gradle/cli/CommandLineParser$OptionAwareParserState.class -org/gradle/cli/CommandLineConverter.class -org/gradle/cli/CommandLineParser$BeforeFirstSubCommand.class -org/gradle/cli/SystemPropertiesCommandLineConverter.class -org/gradle/cli/CommandLineParser$ParserState.class -org/gradle/cli/CommandLineParser$AfterFirstSubCommand.class -gradle-cli-classpath.properties diff --git a/samples/client/petstore/android/volley/src/main/java/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/android/volley/src/main/java/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 1bbc424ca7e..00000000000 --- a/samples/client/petstore/android/volley/src/main/java/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Mon May 16 21:00:31 CST 2016 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiException.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/ApiException.java similarity index 88% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiException.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/ApiException.java index a7700357e23..949b2edff99 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiException.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/ApiException.java @@ -5,12 +5,12 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client; +package org.openapitools.client; public class ApiException extends Exception { int code = 0; diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/ApiInvoker.java similarity index 96% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/ApiInvoker.java index 4ffbaf546fb..17a8684d0f8 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/ApiInvoker.java @@ -5,12 +5,12 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client; +package org.openapitools.client; import com.android.volley.Cache; import com.android.volley.DefaultRetryPolicy; @@ -46,14 +46,14 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import io.swagger.client.auth.Authentication; -import io.swagger.client.auth.ApiKeyAuth; -import io.swagger.client.auth.HttpBasicAuth; -import io.swagger.client.request.GetRequest; -import io.swagger.client.request.PostRequest; -import io.swagger.client.request.PutRequest; -import io.swagger.client.request.DeleteRequest; -import io.swagger.client.request.PatchRequest; +import org.openapitools.client.auth.Authentication; +import org.openapitools.client.auth.ApiKeyAuth; +import org.openapitools.client.auth.HttpBasicAuth; +import org.openapitools.client.request.GetRequest; +import org.openapitools.client.request.PostRequest; +import org.openapitools.client.request.PutRequest; +import org.openapitools.client.request.DeleteRequest; +import org.openapitools.client.request.PatchRequest; public class ApiInvoker { private static ApiInvoker INSTANCE; @@ -199,7 +199,7 @@ public class ApiInvoker { public static void initializeInstance(Cache cache, Network network, int threadPoolSize, ResponseDelivery delivery, int connectionTimeout) { INSTANCE = new ApiInvoker(cache, network, threadPoolSize, delivery, connectionTimeout); - setUserAgent("Swagger-Codegen/1.0.0/android"); + setUserAgent("OpenAPI-Generator/1.0.0/android"); // Setup authentications (key: authentication name, value: authentication). INSTANCE.authentications = new HashMap(); diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/JsonUtil.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/JsonUtil.java similarity index 94% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/JsonUtil.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/JsonUtil.java index 8cd11f0d8b3..f7836e38476 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/JsonUtil.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/JsonUtil.java @@ -5,12 +5,12 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client; +package org.openapitools.client; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -22,7 +22,7 @@ import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; import java.util.List; import java.util.Date; -import io.swagger.client.model.*; +import org.openapitools.client.model.*; public class JsonUtil { public static GsonBuilder gsonBuilder; diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/Pair.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/Pair.java similarity index 86% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/Pair.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/Pair.java index d82e0db36d6..3a71b7be121 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/Pair.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/Pair.java @@ -5,12 +5,12 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client; +package org.openapitools.client; public class Pair { private String name = ""; diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/api/PetApi.java similarity index 98% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/api/PetApi.java index f625ba18120..4f8a3053c3a 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/api/PetApi.java @@ -5,27 +5,27 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.api; +package org.openapitools.client.api; -import io.swagger.client.ApiInvoker; -import io.swagger.client.ApiException; -import io.swagger.client.Pair; +import org.openapitools.client.ApiInvoker; +import org.openapitools.client.ApiException; +import org.openapitools.client.Pair; -import io.swagger.client.model.*; +import org.openapitools.client.model.*; import java.util.*; import com.android.volley.Response; import com.android.volley.VolleyError; -import io.swagger.client.model.ApiResponse; +import org.openapitools.client.model.ApiResponse; import java.io.File; -import io.swagger.client.model.Pet; +import org.openapitools.client.model.Pet; import org.apache.http.HttpEntity; import org.apache.http.entity.mime.MultipartEntityBuilder; @@ -81,6 +81,8 @@ public class PetApi { // form params Map formParams = new HashMap(); String[] contentTypes = { + "application/json", + "application/xml" }; String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; @@ -146,7 +148,7 @@ public class PetApi { String[] contentTypes = { - + "application/json","application/xml" }; String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; @@ -715,6 +717,8 @@ public class PetApi { // form params Map formParams = new HashMap(); String[] contentTypes = { + "application/json", + "application/xml" }; String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; @@ -780,7 +784,7 @@ public class PetApi { String[] contentTypes = { - + "application/json","application/xml" }; String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/api/StoreApi.java similarity index 97% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/StoreApi.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/api/StoreApi.java index f2f3324c5eb..1d9935f2d3b 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/api/StoreApi.java @@ -5,18 +5,18 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.api; +package org.openapitools.client.api; -import io.swagger.client.ApiInvoker; -import io.swagger.client.ApiException; -import io.swagger.client.Pair; +import org.openapitools.client.ApiInvoker; +import org.openapitools.client.ApiException; +import org.openapitools.client.Pair; -import io.swagger.client.model.*; +import org.openapitools.client.model.*; import java.util.*; @@ -24,7 +24,7 @@ import com.android.volley.Response; import com.android.volley.VolleyError; import java.util.Map; -import io.swagger.client.model.Order; +import org.openapitools.client.model.Order; import org.apache.http.HttpEntity; import org.apache.http.entity.mime.MultipartEntityBuilder; @@ -446,7 +446,6 @@ public class StoreApi { // form params Map formParams = new HashMap(); String[] contentTypes = { - "application/json" }; String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; @@ -512,7 +511,7 @@ public class StoreApi { String[] contentTypes = { - "application/json" + }; String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/api/UserApi.java similarity index 98% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/UserApi.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/api/UserApi.java index d8ec138b147..e8ad22511c3 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/api/UserApi.java @@ -5,18 +5,18 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.api; +package org.openapitools.client.api; -import io.swagger.client.ApiInvoker; -import io.swagger.client.ApiException; -import io.swagger.client.Pair; +import org.openapitools.client.ApiInvoker; +import org.openapitools.client.ApiException; +import org.openapitools.client.Pair; -import io.swagger.client.model.*; +import org.openapitools.client.model.*; import java.util.*; @@ -24,7 +24,7 @@ import com.android.volley.Response; import com.android.volley.VolleyError; import java.util.*; -import io.swagger.client.model.User; +import org.openapitools.client.model.User; import org.apache.http.HttpEntity; import org.apache.http.entity.mime.MultipartEntityBuilder; @@ -80,7 +80,6 @@ public class UserApi { // form params Map formParams = new HashMap(); String[] contentTypes = { - "application/json" }; String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; @@ -146,7 +145,7 @@ public class UserApi { String[] contentTypes = { - "application/json" + }; String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; @@ -960,7 +959,6 @@ public class UserApi { // form params Map formParams = new HashMap(); String[] contentTypes = { - "application/json" }; String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; @@ -1031,7 +1029,7 @@ public class UserApi { String[] contentTypes = { - "application/json" + }; String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java similarity index 88% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/auth/ApiKeyAuth.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java index 5df37cb9121..8ea1d3d0f15 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/auth/ApiKeyAuth.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java @@ -5,14 +5,14 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.auth; +package org.openapitools.client.auth; -import io.swagger.client.Pair; +import org.openapitools.client.Pair; import java.util.Map; import java.util.List; diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/auth/Authentication.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/auth/Authentication.java similarity index 75% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/auth/Authentication.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/auth/Authentication.java index 02045a375dc..1d5fd8b0e71 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/auth/Authentication.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/auth/Authentication.java @@ -5,14 +5,14 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.auth; +package org.openapitools.client.auth; -import io.swagger.client.Pair; +import org.openapitools.client.Pair; import java.util.Map; import java.util.List; diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java similarity index 85% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/auth/HttpBasicAuth.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java index dbefda822f3..ee1eebfdeef 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/auth/HttpBasicAuth.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java @@ -5,14 +5,14 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.auth; +package org.openapitools.client.auth; -import io.swagger.client.Pair; +import org.openapitools.client.Pair; import android.util.Base64; diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/ApiResponse.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/model/ApiResponse.java similarity index 93% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/ApiResponse.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/model/ApiResponse.java index 27b63fa1470..aabbf35b059 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/ApiResponse.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/model/ApiResponse.java @@ -5,12 +5,12 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.model; +package org.openapitools.client.model; import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/model/Category.java similarity index 91% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Category.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/model/Category.java index 6a5c1b3f71d..c8a9e4c9ed2 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Category.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/model/Category.java @@ -5,12 +5,12 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.model; +package org.openapitools.client.model; import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/model/Order.java similarity index 95% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Order.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/model/Order.java index 63ff6f364b7..d0a4e4c236d 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Order.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/model/Order.java @@ -5,12 +5,12 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.model; +package org.openapitools.client.model; import java.util.Date; import io.swagger.annotations.*; @@ -36,7 +36,7 @@ public class Order { @SerializedName("status") private StatusEnum status = null; @SerializedName("complete") - private Boolean complete = null; + private Boolean complete = false; /** **/ diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/model/Pet.java similarity index 93% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Pet.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/model/Pet.java index 7191b3d6dc0..53b9772dd80 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/model/Pet.java @@ -5,16 +5,16 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.model; +package org.openapitools.client.model; -import io.swagger.client.model.Category; -import io.swagger.client.model.Tag; import java.util.*; +import org.openapitools.client.model.Category; +import org.openapitools.client.model.Tag; import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/model/Tag.java similarity index 91% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Tag.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/model/Tag.java index c4eb49aa8a2..113d20747dc 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Tag.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/model/Tag.java @@ -5,12 +5,12 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.model; +package org.openapitools.client.model; import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/model/User.java similarity index 96% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/User.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/model/User.java index 11617e989f7..ef267007a94 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/User.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/model/User.java @@ -5,12 +5,12 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.model; +package org.openapitools.client.model; import io.swagger.annotations.*; import com.google.gson.annotations.SerializedName; diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/DeleteRequest.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/request/DeleteRequest.java similarity index 94% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/DeleteRequest.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/request/DeleteRequest.java index a75ca45a98f..337595520d2 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/DeleteRequest.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/request/DeleteRequest.java @@ -5,12 +5,12 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.request; +package org.openapitools.client.request; import com.android.volley.AuthFailureError; import com.android.volley.NetworkResponse; diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/GetRequest.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/request/GetRequest.java similarity index 90% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/GetRequest.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/request/GetRequest.java index de64e920320..6aa5a601104 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/GetRequest.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/request/GetRequest.java @@ -5,12 +5,12 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.request; +package org.openapitools.client.request; import com.android.volley.AuthFailureError; import com.android.volley.Response; diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/PatchRequest.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/request/PatchRequest.java similarity index 94% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/PatchRequest.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/request/PatchRequest.java index 09fac5e1148..a5b36cb3675 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/PatchRequest.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/request/PatchRequest.java @@ -5,12 +5,12 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.request; +package org.openapitools.client.request; import com.android.volley.AuthFailureError; import com.android.volley.NetworkResponse; diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/PostRequest.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/request/PostRequest.java similarity index 94% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/PostRequest.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/request/PostRequest.java index 459ab851b0a..c7aa8dab7ad 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/PostRequest.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/request/PostRequest.java @@ -5,12 +5,12 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.request; +package org.openapitools.client.request; import com.android.volley.AuthFailureError; import com.android.volley.NetworkResponse; diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/PutRequest.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/request/PutRequest.java similarity index 94% rename from samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/PutRequest.java rename to samples/client/petstore/android/volley/src/main/java/org/openapitools/client/request/PutRequest.java index c489cce2cdc..c03e115db2f 100644 --- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/request/PutRequest.java +++ b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/request/PutRequest.java @@ -5,12 +5,12 @@ * 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 + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech * Do not edit the class manually. */ -package io.swagger.client.request; +package org.openapitools.client.request; import com.android.volley.AuthFailureError; import com.android.volley.NetworkResponse;