From b947970f99d599bc4dcfe624c11ea0f4f3ec723a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Bresson?= Date: Mon, 7 May 2018 08:43:57 +0200 Subject: [PATCH] Rename default packages for java (#341) --- .../languages/AbstractJavaCodegen.java | 46 +- .../codegen/java/AbstractJavaCodegenTest.java | 4 +- .../okhttp-gson/.openapi-generator-ignore | 6 +- .../okhttp-gson/.openapi-generator/VERSION | 2 +- .../java/okhttp-gson/.travis.yml | 2 +- .../java/okhttp-gson/README.md | 67 +-- .../java/okhttp-gson/build.gradle | 7 +- .../java/okhttp-gson/build.sbt | 7 +- .../java/okhttp-gson/docs/FakeApi.md | 16 +- .../java/okhttp-gson/git_push.sh | 4 +- .../java/okhttp-gson/pom.xml | 445 +++++++++--------- .../java/okhttp-gson/settings.gradle | 2 +- .../okhttp-gson/src/main/AndroidManifest.xml | 2 +- .../gen/io/swagger/client/BuildConfig.java | 8 - .../main/gen/io/swagger/client/Manifest.java | 7 - .../src/main/gen/io/swagger/client/R.java | 7 - .../openapitools}/client/ApiCallback.java | 6 +- .../openapitools}/client/ApiClient.java | 20 +- .../openapitools}/client/ApiException.java | 6 +- .../openapitools}/client/ApiResponse.java | 6 +- .../openapitools}/client/Configuration.java | 6 +- .../client/GzipRequestInterceptor.java | 6 +- .../openapitools}/client/JSON.java | 68 ++- .../openapitools}/client/Pair.java | 6 +- .../client/ProgressRequestBody.java | 6 +- .../client/ProgressResponseBody.java | 6 +- .../openapitools}/client/StringUtil.java | 6 +- .../openapitools}/client/api/FakeApi.java | 55 ++- .../openapitools}/client/auth/ApiKeyAuth.java | 8 +- .../client/auth/Authentication.java | 8 +- .../client/auth/HttpBasicAuth.java | 8 +- .../openapitools}/client/auth/OAuth.java | 8 +- .../openapitools}/client/auth/OAuthFlow.java | 6 +- .../client/model/ModelReturn.java | 7 +- .../io/swagger/client/api/FakeApiTest.java | 60 --- .../openapitools/client/api/FakeApiTest.java | 51 ++ .../jaxrs-cxf/.openapi-generator-ignore | 23 - samples/client/petstore/jaxrs-cxf/pom.xml | 174 ------- .../src/gen/java/io/swagger/api/FakeApi.java | 45 -- .../src/gen/java/io/swagger/api/PetApi.java | 76 --- .../src/gen/java/io/swagger/api/StoreApi.java | 46 -- .../src/gen/java/io/swagger/api/UserApi.java | 70 --- .../model/AdditionalPropertiesClass.java | 90 ---- .../src/gen/java/io/swagger/model/Animal.java | 77 --- .../gen/java/io/swagger/model/AnimalFarm.java | 40 -- .../model/ArrayOfArrayOfNumberOnly.java | 65 --- .../io/swagger/model/ArrayOfNumberOnly.java | 65 --- .../gen/java/io/swagger/model/ArrayTest.java | 115 ----- .../java/io/swagger/model/Capitalization.java | 157 ------ .../src/gen/java/io/swagger/model/Cat.java | 58 --- .../gen/java/io/swagger/model/Category.java | 77 --- .../gen/java/io/swagger/model/ClassModel.java | 59 --- .../src/gen/java/io/swagger/model/Client.java | 57 --- .../src/gen/java/io/swagger/model/Dog.java | 58 --- .../gen/java/io/swagger/model/EnumArrays.java | 150 ------ .../gen/java/io/swagger/model/EnumClass.java | 37 -- .../gen/java/io/swagger/model/EnumTest.java | 217 --------- .../gen/java/io/swagger/model/FormatTest.java | 310 ------------ .../io/swagger/model/HasOnlyReadOnly.java | 61 --- .../gen/java/io/swagger/model/MapTest.java | 123 ----- ...ropertiesAndAdditionalPropertiesClass.java | 107 ----- .../io/swagger/model/Model200Response.java | 79 ---- .../io/swagger/model/ModelApiResponse.java | 97 ---- .../java/io/swagger/model/ModelReturn.java | 59 --- .../src/gen/java/io/swagger/model/Name.java | 103 ---- .../gen/java/io/swagger/model/NumberOnly.java | 58 --- .../src/gen/java/io/swagger/model/Order.java | 190 -------- .../gen/java/io/swagger/model/OuterEnum.java | 37 -- .../src/gen/java/io/swagger/model/Pet.java | 204 -------- .../java/io/swagger/model/ReadOnlyFirst.java | 69 --- .../io/swagger/model/SpecialModelName.java | 57 --- .../src/gen/java/io/swagger/model/Tag.java | 77 --- .../src/gen/java/io/swagger/model/User.java | 197 -------- .../test/java/io/swagger/api/FakeApiTest.java | 146 ------ .../test/java/io/swagger/api/PetApiTest.java | 221 --------- .../java/io/swagger/api/StoreApiTest.java | 141 ------ .../test/java/io/swagger/api/UserApiTest.java | 215 --------- 77 files changed, 530 insertions(+), 4762 deletions(-) delete mode 100644 samples/client/petstore-security-test/java/okhttp-gson/src/main/gen/io/swagger/client/BuildConfig.java delete mode 100644 samples/client/petstore-security-test/java/okhttp-gson/src/main/gen/io/swagger/client/Manifest.java delete mode 100644 samples/client/petstore-security-test/java/okhttp-gson/src/main/gen/io/swagger/client/R.java rename samples/client/petstore-security-test/java/okhttp-gson/src/main/java/{io/swagger => org/openapitools}/client/ApiCallback.java (92%) rename samples/client/petstore-security-test/java/okhttp-gson/src/main/java/{io/swagger => org/openapitools}/client/ApiClient.java (98%) rename samples/client/petstore-security-test/java/okhttp-gson/src/main/java/{io/swagger => org/openapitools}/client/ApiException.java (94%) rename samples/client/petstore-security-test/java/okhttp-gson/src/main/java/{io/swagger => org/openapitools}/client/ApiResponse.java (90%) rename samples/client/petstore-security-test/java/okhttp-gson/src/main/java/{io/swagger => org/openapitools}/client/Configuration.java (87%) rename samples/client/petstore-security-test/java/okhttp-gson/src/main/java/{io/swagger => org/openapitools}/client/GzipRequestInterceptor.java (94%) rename samples/client/petstore-security-test/java/okhttp-gson/src/main/java/{io/swagger => org/openapitools}/client/JSON.java (81%) rename samples/client/petstore-security-test/java/okhttp-gson/src/main/java/{io/swagger => org/openapitools}/client/Pair.java (87%) rename samples/client/petstore-security-test/java/okhttp-gson/src/main/java/{io/swagger => org/openapitools}/client/ProgressRequestBody.java (93%) rename samples/client/petstore-security-test/java/okhttp-gson/src/main/java/{io/swagger => org/openapitools}/client/ProgressResponseBody.java (93%) rename samples/client/petstore-security-test/java/okhttp-gson/src/main/java/{io/swagger => org/openapitools}/client/StringUtil.java (90%) rename samples/client/petstore-security-test/java/okhttp-gson/src/main/java/{io/swagger => org/openapitools}/client/api/FakeApi.java (69%) rename samples/client/petstore-security-test/java/okhttp-gson/src/main/java/{io/swagger => org/openapitools}/client/auth/ApiKeyAuth.java (88%) rename samples/client/petstore-security-test/java/okhttp-gson/src/main/java/{io/swagger => org/openapitools}/client/auth/Authentication.java (79%) rename samples/client/petstore-security-test/java/okhttp-gson/src/main/java/{io/swagger => org/openapitools}/client/auth/HttpBasicAuth.java (86%) rename samples/client/petstore-security-test/java/okhttp-gson/src/main/java/{io/swagger => org/openapitools}/client/auth/OAuth.java (81%) rename samples/client/petstore-security-test/java/okhttp-gson/src/main/java/{io/swagger => org/openapitools}/client/auth/OAuthFlow.java (74%) rename samples/client/petstore-security-test/java/okhttp-gson/src/main/java/{io/swagger => org/openapitools}/client/model/ModelReturn.java (92%) delete mode 100644 samples/client/petstore-security-test/java/okhttp-gson/src/test/java/io/swagger/client/api/FakeApiTest.java create mode 100644 samples/client/petstore-security-test/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java delete mode 100644 samples/client/petstore/jaxrs-cxf/.openapi-generator-ignore delete mode 100644 samples/client/petstore/jaxrs-cxf/pom.xml delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/FakeApi.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/PetApi.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/StoreApi.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/UserApi.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Animal.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/AnimalFarm.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayTest.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Capitalization.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Cat.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Category.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ClassModel.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Client.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Dog.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumArrays.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumClass.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumTest.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/FormatTest.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/HasOnlyReadOnly.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MapTest.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Model200Response.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelApiResponse.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelReturn.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Name.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/NumberOnly.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Order.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/OuterEnum.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Pet.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ReadOnlyFirst.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/SpecialModelName.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Tag.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/User.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/test/java/io/swagger/api/FakeApiTest.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/test/java/io/swagger/api/PetApiTest.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/test/java/io/swagger/api/StoreApiTest.java delete mode 100644 samples/client/petstore/jaxrs-cxf/src/test/java/io/swagger/api/UserApiTest.java diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index 19365ae03c1..bc382c9992b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -17,35 +17,41 @@ package org.openapitools.codegen.languages; +import com.google.common.base.Strings; + +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.Operation; +import io.swagger.v3.oas.models.PathItem; +import io.swagger.v3.oas.models.media.ArraySchema; +import io.swagger.v3.oas.models.media.Schema; +import io.swagger.v3.oas.models.media.StringSchema; +import io.swagger.v3.parser.util.SchemaTypeUtil; + +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; +import org.openapitools.codegen.CliOption; +import org.openapitools.codegen.CodegenConfig; +import org.openapitools.codegen.CodegenConstants; +import org.openapitools.codegen.CodegenModel; +import org.openapitools.codegen.CodegenOperation; +import org.openapitools.codegen.CodegenParameter; +import org.openapitools.codegen.CodegenProperty; +import org.openapitools.codegen.DefaultCodegen; +import org.openapitools.codegen.utils.ModelUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.File; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.ListIterator; import java.util.Map; -import java.util.Set; import java.util.regex.Pattern; -import io.swagger.v3.oas.models.PathItem; -import io.swagger.v3.parser.util.SchemaTypeUtil; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.commons.lang3.StringUtils; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.base.Strings; - -import org.openapitools.codegen.*; -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 io.swagger.v3.oas.models.parameters.*; - public abstract class AbstractJavaCodegen extends DefaultCodegen implements CodegenConfig { static Logger LOGGER = LoggerFactory.getLogger(AbstractJavaCodegen.class); @@ -61,7 +67,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code protected boolean supportAsync = false; protected boolean java8Mode = false; protected boolean withXml = false; - protected String invokerPackage = "io.swagger"; + protected String invokerPackage = "org.openapitools"; protected String groupId = "org.openapitools"; protected String artifactId = "openapi-java"; protected String artifactVersion = "1.0.0"; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java index c296eea3864..3ce798ae5df 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java @@ -94,8 +94,8 @@ public class AbstractJavaCodegenTest { Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "invalidPackageName"); Assert.assertEquals(codegen.apiPackage(), "invalidPackageName"); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "invalidPackageName"); - Assert.assertEquals(codegen.getInvokerPackage(), "io.swagger"); - Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "io.swagger"); + Assert.assertEquals(codegen.getInvokerPackage(), "org.openapitools"); + Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "org.openapitools"); } @Test diff --git a/samples/client/petstore-security-test/java/okhttp-gson/.openapi-generator-ignore b/samples/client/petstore-security-test/java/okhttp-gson/.openapi-generator-ignore index c5fa491b4c5..7484ee590a3 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/.openapi-generator-ignore +++ b/samples/client/petstore-security-test/java/okhttp-gson/.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-security-test/java/okhttp-gson/.openapi-generator/VERSION b/samples/client/petstore-security-test/java/okhttp-gson/.openapi-generator/VERSION index f9f7450d135..096bf47efe3 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/.openapi-generator/VERSION +++ b/samples/client/petstore-security-test/java/okhttp-gson/.openapi-generator/VERSION @@ -1 +1 @@ -2.3.0-SNAPSHOT \ No newline at end of file +3.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore-security-test/java/okhttp-gson/.travis.yml b/samples/client/petstore-security-test/java/okhttp-gson/.travis.yml index 70cb81a67c2..80a7f2fc66c 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/.travis.yml +++ b/samples/client/petstore-security-test/java/okhttp-gson/.travis.yml @@ -1,5 +1,5 @@ # -# Generated by: https://github.com/swagger-api/swagger-codegen.git +# Generated by: https://openapi-generator.tech # language: java jdk: diff --git a/samples/client/petstore-security-test/java/okhttp-gson/README.md b/samples/client/petstore-security-test/java/okhttp-gson/README.md index 63efd69e9b8..94ea9ea3c66 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/README.md +++ b/samples/client/petstore-security-test/java/okhttp-gson/README.md @@ -1,24 +1,35 @@ -# swagger-petstore-okhttp-gson +# petstore-okhttp-gson + +Swagger Petstore *_/ ' \" =end -- \\r\\n \\n \\r +- API version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r + +This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ *_/ ' \" =end -- + + +*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)* + ## Requirements -Building the API client library requires [Maven](https://maven.apache.org/) to be installed. +Building the API client library requires: +1. Java 1.7+ +2. Maven/Gradle ## Installation To install the API client library to your local Maven repository, simply execute: ```shell -mvn install +mvn clean install ``` To deploy it to a remote Maven repository instead, configure the settings of the repository and execute: ```shell -mvn deploy +mvn clean deploy ``` -Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information. +Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information. ### Maven users @@ -26,10 +37,10 @@ Add this dependency to your project's POM: ```xml - io.swagger - swagger-petstore-okhttp-gson - 1.0.0 - compile + org.openapitools + petstore-okhttp-gson + 1.0.0 + compile ``` @@ -38,19 +49,21 @@ Add this dependency to your project's POM: Add this dependency to your project's build file: ```groovy -compile "io.swagger:swagger-petstore-okhttp-gson:1.0.0" +compile "org.openapitools:petstore-okhttp-gson:1.0.0" ``` ### Others At first generate the JAR by executing: - mvn package +```shell +mvn clean package +``` Then manually install the following JARs: -* target/swagger-petstore-okhttp-gson-1.0.0.jar -* target/lib/*.jar +* `target/petstore-okhttp-gson-1.0.0.jar` +* `target/lib/*.jar` ## Getting Started @@ -58,10 +71,10 @@ Please follow the [installation](#installation) instruction and execute the foll ```java -import io.swagger.client.*; -import io.swagger.client.auth.*; -import io.swagger.client.model.*; -import io.swagger.client.api.FakeApi; +import org.openapitools.client.*; +import org.openapitools.client.auth.*; +import org.openapitools.client.model.*; +import org.openapitools.client.api.FakeApi; import java.io.File; import java.util.*; @@ -71,11 +84,11 @@ public class FakeApiExample { public static void main(String[] args) { FakeApi apiInstance = new FakeApi(); - String testCodeInjectEnd = "testCodeInjectEnd_example"; // String | To test code injection ' \" =end + ERRORUNKNOWN UNKNOWN_BASE_TYPE = new UNKNOWN_BASE_TYPE(); // ERRORUNKNOWN | try { - apiInstance.testCodeInjectEnd(testCodeInjectEnd); + apiInstance.testCodeInjectEndRnNR(UNKNOWN_BASE_TYPE); } catch (ApiException e) { - System.err.println("Exception when calling FakeApi#testCodeInjectEnd"); + System.err.println("Exception when calling FakeApi#testCodeInjectEndRnNR"); e.printStackTrace(); } } @@ -85,11 +98,11 @@ public class FakeApiExample { ## Documentation for API Endpoints -All URIs are relative to *https://petstore.swagger.io ' \" =end/v2 ' \" =end* +All URIs are relative to *petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- -*FakeApi* | [**testCodeInjectEnd**](docs/FakeApi.md#testCodeInjectEnd) | **PUT** /fake | To test code injection ' \" =end +*FakeApi* | [**testCodeInjectEndRnNR**](docs/FakeApi.md#testCodeInjectEndRnNR) | **PUT** /fake | To test code injection *_/ ' \" =end -- \\r\\n \\n \\r ## Documentation for Models @@ -103,7 +116,7 @@ Authentication schemes defined for the API: ### api_key - **Type**: API key -- **API key parameter name**: api_key */ ' " =end +- **API key parameter name**: api_key */ ' " =end -- \r\n \n \r - **Location**: HTTP header ### petstore_auth @@ -112,15 +125,15 @@ Authentication schemes defined for the API: - **Flow**: implicit - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog - **Scopes**: - - write:pets: modify pets in your account */ ' " =end - - read:pets: read your pets */ ' " =end + - write:pets: modify pets in your account *_/ ' \" =end -- \\r\\n \\n \\r + - read:pets: read your pets *_/ ' \" =end -- \\r\\n \\n \\r ## Recommendation -It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issue. +It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issues. ## Author -apiteam@swagger.io ' \" =end +apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r diff --git a/samples/client/petstore-security-test/java/okhttp-gson/build.gradle b/samples/client/petstore-security-test/java/okhttp-gson/build.gradle index 534d4777929..df65ade70d1 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/build.gradle +++ b/samples/client/petstore-security-test/java/okhttp-gson/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'idea' apply plugin: 'eclipse' -group = 'io.swagger' +group = 'org.openapitools' version = '1.0.0' buildscript { @@ -83,7 +83,7 @@ if(hasProperty('target') && target == 'android') { install { repositories.mavenInstaller { - pom.artifactId = 'swagger-petstore-okhttp-gson' + pom.artifactId = 'petstore-okhttp-gson' } } @@ -94,10 +94,11 @@ if(hasProperty('target') && target == 'android') { } dependencies { - compile 'io.swagger:swagger-annotations:1.5.15' + compile 'io.swagger:swagger-annotations:1.5.17' compile 'com.squareup.okhttp:okhttp:2.7.5' compile 'com.squareup.okhttp:logging-interceptor:2.7.5' compile 'com.google.code.gson:gson:2.8.1' + compile 'io.gsonfire:gson-fire:1.8.0' compile 'org.threeten:threetenbp:1.3.5' testCompile 'junit:junit:4.12' } diff --git a/samples/client/petstore-security-test/java/okhttp-gson/build.sbt b/samples/client/petstore-security-test/java/okhttp-gson/build.sbt index 03c3ac9e231..d7dc9adb619 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/build.sbt +++ b/samples/client/petstore-security-test/java/okhttp-gson/build.sbt @@ -1,7 +1,7 @@ lazy val root = (project in file(".")). settings( - organization := "io.swagger", - name := "swagger-petstore-okhttp-gson", + organization := "org.openapitools", + name := "petstore-okhttp-gson", version := "1.0.0", scalaVersion := "2.11.4", scalacOptions ++= Seq("-feature"), @@ -9,11 +9,12 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.15", + "io.swagger" % "swagger-annotations" % "1.5.17", "com.squareup.okhttp" % "okhttp" % "2.7.5", "com.squareup.okhttp" % "logging-interceptor" % "2.7.5", "com.google.code.gson" % "gson" % "2.8.1", "org.threeten" % "threetenbp" % "1.3.5" % "compile", + "io.gsonfire" % "gson-fire" % "1.8.0" % "compile", "junit" % "junit" % "4.12" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/client/petstore-security-test/java/okhttp-gson/docs/FakeApi.md b/samples/client/petstore-security-test/java/okhttp-gson/docs/FakeApi.md index 5fadd46078b..032e69ed873 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/docs/FakeApi.md +++ b/samples/client/petstore-security-test/java/okhttp-gson/docs/FakeApi.md @@ -1,6 +1,6 @@ # FakeApi -All URIs are relative to *https://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r* +All URIs are relative to *petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r* Method | HTTP request | Description ------------- | ------------- | ------------- @@ -9,21 +9,21 @@ Method | HTTP request | Description # **testCodeInjectEndRnNR** -> testCodeInjectEndRnNR(testCodeInjectEndRnNR) +> testCodeInjectEndRnNR(UNKNOWN_BASE_TYPE) To test code injection *_/ ' \" =end -- \\r\\n \\n \\r ### Example ```java // Import classes: -//import io.swagger.client.ApiException; -//import io.swagger.client.api.FakeApi; +//import org.openapitools.client.ApiException; +//import org.openapitools.client.api.FakeApi; FakeApi apiInstance = new FakeApi(); -String testCodeInjectEndRnNR = "testCodeInjectEndRnNR_example"; // String | To test code injection *_/ ' \" =end -- \\r\\n \\n \\r +ERRORUNKNOWN UNKNOWN_BASE_TYPE = new UNKNOWN_BASE_TYPE(); // ERRORUNKNOWN | try { - apiInstance.testCodeInjectEndRnNR(testCodeInjectEndRnNR); + apiInstance.testCodeInjectEndRnNR(UNKNOWN_BASE_TYPE); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testCodeInjectEndRnNR"); e.printStackTrace(); @@ -34,7 +34,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **testCodeInjectEndRnNR** | **String**| To test code injection *_/ ' \" =end -- \\r\\n \\n \\r | [optional] + **UNKNOWN_BASE_TYPE** | [**ERRORUNKNOWN**](UNKNOWN_BASE_TYPE.md)| | [optional] ### Return type @@ -47,5 +47,5 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json, *_/ ' =end -- - - **Accept**: application/json, *_/ ' =end -- + - **Accept**: Not defined diff --git a/samples/client/petstore-security-test/java/okhttp-gson/git_push.sh b/samples/client/petstore-security-test/java/okhttp-gson/git_push.sh index ed374619b13..8442b80bb44 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/git_push.sh +++ b/samples/client/petstore-security-test/java/okhttp-gson/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 @@ -36,7 +36,7 @@ git_remote=`git remote` if [ "$git_remote" = "" ]; then # git remote not defined if [ "$GIT_TOKEN" = "" ]; then - echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment." + echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment." git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git else git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git diff --git a/samples/client/petstore-security-test/java/okhttp-gson/pom.xml b/samples/client/petstore-security-test/java/okhttp-gson/pom.xml index 9fbc7d0e39d..e019833bfa1 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/pom.xml +++ b/samples/client/petstore-security-test/java/okhttp-gson/pom.xml @@ -1,217 +1,242 @@ - 4.0.0 - io.swagger - swagger-petstore-okhttp-gson - jar - swagger-petstore-okhttp-gson - 1.0.0 - https://github.com/swagger-api/swagger-codegen - Swagger Java - - scm:git:git@github.com:swagger-api/swagger-codegen.git - scm:git:git@github.com:swagger-api/swagger-codegen.git - https://github.com/swagger-api/swagger-codegen - - - 2.2.0 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + org.openapitools + petstore-okhttp-gson + jar + petstore-okhttp-gson + 1.0.0 + https://github.com/openapitools/openapi-generator + OpenAPI Java + + scm:git:git@github.com:openapitools/openapi-generator.git + scm:git:git@github.com:openapitools/openapi-generator.git + https://github.com/openapitools/openapi-generator + - - - Unlicense - http://www.apache.org/licenses/LICENSE-2.0.html *_/ ' \" =end -- \\r\\n \\n \\r - repo - - + + + Unlicense + http://www.apache.org/licenses/LICENSE-2.0.html *_/ ' \" =end -- \\r\\n \\n \\r + repo + + - - - Swagger - apiteam@swagger.io - Swagger - http://swagger.io - - + + + OpenAPI + team@openapitools.org + OpenAPI + http://openapitools.org + + - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12 - - - - loggerPath - conf/log4j.properties - - - -Xms512m -Xmx1500m - methods - pertest - - - - maven-dependency-plugin - - - package - - copy-dependencies - - - ${project.build.directory}/lib - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.2 - - - - jar - test-jar - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.10 - - - add_sources - generate-sources - - add-source - - - - src/main/java - - - - - add_test_sources - generate-test-sources - - add-test-source - - - - src/test/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - - - - - sign-artifacts - + - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - - - + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0-M1 + + + enforce-maven + + enforce + + + + + 2.2.0 + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12 + + + + loggerPath + conf/log4j.properties + + + -Xms512m -Xmx1500m + methods + pertest + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory}/lib + + + + - - - io.swagger - swagger-annotations - ${swagger-core-version} - - - com.squareup.okhttp - okhttp - ${okhttp-version} - - - com.squareup.okhttp - logging-interceptor - ${okhttp-version} - - - com.google.code.gson - gson - ${gson-version} - - - org.threeten - threetenbp - ${threetenbp-version} - - - - junit - junit - ${junit-version} - test - - - - 1.7 - ${java.version} - ${java.version} - 1.5.18 - 2.7.5 - 2.8.1 - 1.3.5 - 1.0.0 - 4.12 - UTF-8 - + + + org.apache.maven.plugins + maven-jar-plugin + 2.2 + + + + jar + test-jar + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.10 + + + add_sources + generate-sources + + add-source + + + + + src/main/java + + + + + add_test_sources + generate-test-sources + + add-test-source + + + + + src/test/java + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + + + + + sign-artifacts + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + + + + + + + io.swagger + swagger-annotations + ${swagger-core-version} + + + com.squareup.okhttp + okhttp + ${okhttp-version} + + + com.squareup.okhttp + logging-interceptor + ${okhttp-version} + + + com.google.code.gson + gson + ${gson-version} + + + io.gsonfire + gson-fire + ${gson-fire-version} + + + org.threeten + threetenbp + ${threetenbp-version} + + + + junit + junit + ${junit-version} + test + + + + 1.7 + ${java.version} + ${java.version} + 1.8.0 + 1.5.18 + 2.7.5 + 2.8.1 + 1.3.5 + 1.0.0 + 4.12 + UTF-8 + diff --git a/samples/client/petstore-security-test/java/okhttp-gson/settings.gradle b/samples/client/petstore-security-test/java/okhttp-gson/settings.gradle index b73eec84591..3e4b819a481 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/settings.gradle +++ b/samples/client/petstore-security-test/java/okhttp-gson/settings.gradle @@ -1 +1 @@ -rootProject.name = "swagger-petstore-okhttp-gson" \ No newline at end of file +rootProject.name = "petstore-okhttp-gson" \ No newline at end of file diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/AndroidManifest.xml b/samples/client/petstore-security-test/java/okhttp-gson/src/main/AndroidManifest.xml index 465dcb520c4..54fbcb3da1e 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/AndroidManifest.xml +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/AndroidManifest.xml @@ -1,3 +1,3 @@ - + diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/gen/io/swagger/client/BuildConfig.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/gen/io/swagger/client/BuildConfig.java deleted file mode 100644 index 720765940d3..00000000000 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/gen/io/swagger/client/BuildConfig.java +++ /dev/null @@ -1,8 +0,0 @@ -/*___Generated_by_IDEA___*/ - -package io.swagger.client; - -/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */ -public final class BuildConfig { - public final static boolean DEBUG = Boolean.parseBoolean(null); -} \ No newline at end of file diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/gen/io/swagger/client/Manifest.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/gen/io/swagger/client/Manifest.java deleted file mode 100644 index 41e0523a208..00000000000 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/gen/io/swagger/client/Manifest.java +++ /dev/null @@ -1,7 +0,0 @@ -/*___Generated_by_IDEA___*/ - -package io.swagger.client; - -/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */ -public final class Manifest { -} \ No newline at end of file diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/gen/io/swagger/client/R.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/gen/io/swagger/client/R.java deleted file mode 100644 index cd0683364d5..00000000000 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/gen/io/swagger/client/R.java +++ /dev/null @@ -1,7 +0,0 @@ -/*___Generated_by_IDEA___*/ - -package io.swagger.client; - -/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */ -public final class R { -} \ No newline at end of file diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ApiCallback.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ApiCallback.java similarity index 92% rename from samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ApiCallback.java rename to samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ApiCallback.java index fba62c4ee90..074e2778f92 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ApiCallback.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ApiCallback.java @@ -5,13 +5,13 @@ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r * - * 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 java.io.IOException; diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java similarity index 98% rename from samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java rename to samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java index 7e15b474c44..16a63e8596a 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java @@ -5,13 +5,13 @@ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r * - * 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.squareup.okhttp.*; import com.squareup.okhttp.internal.http.HttpMethod; @@ -45,14 +45,14 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; -import io.swagger.client.auth.Authentication; -import io.swagger.client.auth.HttpBasicAuth; -import io.swagger.client.auth.ApiKeyAuth; -import io.swagger.client.auth.OAuth; +import org.openapitools.client.auth.Authentication; +import org.openapitools.client.auth.HttpBasicAuth; +import org.openapitools.client.auth.ApiKeyAuth; +import org.openapitools.client.auth.OAuth; public class ApiClient { - private String basePath = "https://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r"; + private String basePath = "petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r"; private boolean debugging = false; private Map defaultHeaderMap = new HashMap(); private String tempFolderPath = null; @@ -85,7 +85,7 @@ public class ApiClient { json = new JSON(); // Set default User-Agent. - setUserAgent("Swagger-Codegen/1.0.0/java"); + setUserAgent("OpenAPI-Generator/1.0.0/java"); // Setup authentications (key: authentication name, value: authentication). authentications = new HashMap(); @@ -107,7 +107,7 @@ public class ApiClient { /** * Set base path * - * @param basePath Base path of the URL (e.g https://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r + * @param basePath Base path of the URL (e.g petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r * @return An instance of OkHttpClient */ public ApiClient setBasePath(String basePath) { diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ApiException.java similarity index 94% rename from samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java rename to samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ApiException.java index fde9789ad13..f89d47e873e 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ApiException.java @@ -5,13 +5,13 @@ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r * - * 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 java.util.Map; import java.util.List; diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ApiResponse.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ApiResponse.java similarity index 90% rename from samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ApiResponse.java rename to samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ApiResponse.java index caace845ec2..5fe8e52c3ee 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ApiResponse.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ApiResponse.java @@ -5,13 +5,13 @@ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r * - * 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 java.util.List; import java.util.Map; diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/Configuration.java similarity index 87% rename from samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java rename to samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/Configuration.java index 876cb734bcc..589ae91e534 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/Configuration.java @@ -5,13 +5,13 @@ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r * - * 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 Configuration { diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/GzipRequestInterceptor.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/GzipRequestInterceptor.java similarity index 94% rename from samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/GzipRequestInterceptor.java rename to samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/GzipRequestInterceptor.java index 179abb3a540..eadbcd3656f 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/GzipRequestInterceptor.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/GzipRequestInterceptor.java @@ -5,13 +5,13 @@ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r * - * 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.squareup.okhttp.*; import okio.Buffer; diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java similarity index 81% rename from samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java rename to samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java index 1c06ba2a65f..bcd9c6963da 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java @@ -5,13 +5,13 @@ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r * - * 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; @@ -20,10 +20,16 @@ import com.google.gson.TypeAdapter; import com.google.gson.internal.bind.util.ISO8601Utils; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import com.google.gson.JsonElement; +import io.gsonfire.GsonFireBuilder; +import io.gsonfire.TypeSelector; import org.threeten.bp.LocalDate; import org.threeten.bp.OffsetDateTime; import org.threeten.bp.format.DateTimeFormatter; +import org.openapitools.client.model.*; +import okio.ByteString; + import java.io.IOException; import java.io.StringReader; import java.lang.reflect.Type; @@ -31,6 +37,8 @@ import java.text.DateFormat; import java.text.ParseException; import java.text.ParsePosition; import java.util.Date; +import java.util.Map; +import java.util.HashMap; public class JSON { private Gson gson; @@ -39,13 +47,37 @@ public class JSON { private SqlDateTypeAdapter sqlDateTypeAdapter = new SqlDateTypeAdapter(); private OffsetDateTimeTypeAdapter offsetDateTimeTypeAdapter = new OffsetDateTimeTypeAdapter(); private LocalDateTypeAdapter localDateTypeAdapter = new LocalDateTypeAdapter(); + private ByteArrayAdapter byteArrayAdapter = new ByteArrayAdapter(); + + public static GsonBuilder createGson() { + GsonFireBuilder fireBuilder = new GsonFireBuilder() + ; + return fireBuilder.createGsonBuilder(); + } + + private static String getDiscriminatorValue(JsonElement readElement, String discriminatorField) { + JsonElement element = readElement.getAsJsonObject().get(discriminatorField); + if(null == element) { + throw new IllegalArgumentException("missing discriminator field: <" + discriminatorField + ">"); + } + return element.getAsString(); + } + + private static Class getClassByDiscriminator(Map classByDiscriminatorValue, String discriminatorValue) { + Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase()); + if(null == clazz) { + throw new IllegalArgumentException("cannot determine model class of name: <" + discriminatorValue + ">"); + } + return clazz; + } public JSON() { - gson = new GsonBuilder() + gson = createGson() .registerTypeAdapter(Date.class, dateTypeAdapter) .registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter) .registerTypeAdapter(OffsetDateTime.class, offsetDateTimeTypeAdapter) .registerTypeAdapter(LocalDate.class, localDateTypeAdapter) + .registerTypeAdapter(byte[].class, byteArrayAdapter) .create(); } @@ -112,6 +144,34 @@ public class JSON { } } + /** + * Gson TypeAdapter for Byte Array type + */ + public class ByteArrayAdapter extends TypeAdapter { + + @Override + public void write(JsonWriter out, byte[] value) throws IOException { + if (value == null) { + out.nullValue(); + } else { + out.value(ByteString.of(value).base64()); + } + } + + @Override + public byte[] read(JsonReader in) throws IOException { + switch (in.peek()) { + case NULL: + in.nextNull(); + return null; + default: + String bytesAsBase64 = in.nextString(); + ByteString byteString = ByteString.decodeBase64(bytesAsBase64); + return byteString.toByteArray(); + } + } + } + /** * Gson TypeAdapter for JSR310 OffsetDateTime type */ diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/Pair.java similarity index 87% rename from samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java rename to samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/Pair.java index 6c3c635847d..4508cc845f0 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/Pair.java @@ -5,13 +5,13 @@ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r * - * 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 { diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ProgressRequestBody.java similarity index 93% rename from samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java rename to samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ProgressRequestBody.java index ae835fb6085..844fece2e20 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ProgressRequestBody.java @@ -5,13 +5,13 @@ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r * - * 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.squareup.okhttp.MediaType; import com.squareup.okhttp.RequestBody; diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ProgressResponseBody.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ProgressResponseBody.java similarity index 93% rename from samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ProgressResponseBody.java rename to samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ProgressResponseBody.java index 6c1d34ca164..193fa4da7c9 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ProgressResponseBody.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/ProgressResponseBody.java @@ -5,13 +5,13 @@ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r * - * 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.squareup.okhttp.MediaType; import com.squareup.okhttp.ResponseBody; diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/StringUtil.java similarity index 90% rename from samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java rename to samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/StringUtil.java index b013889ee6f..2f2637ff7e0 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/StringUtil.java @@ -5,13 +5,13 @@ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r * - * 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 StringUtil { diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java similarity index 69% rename from samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java rename to samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java index 99f88febbd4..a7ea1c7f944 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java @@ -5,28 +5,29 @@ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r * - * 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.ApiCallback; -import io.swagger.client.ApiClient; -import io.swagger.client.ApiException; -import io.swagger.client.ApiResponse; -import io.swagger.client.Configuration; -import io.swagger.client.Pair; -import io.swagger.client.ProgressRequestBody; -import io.swagger.client.ProgressResponseBody; +import org.openapitools.client.ApiCallback; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; +import org.openapitools.client.Pair; +import org.openapitools.client.ProgressRequestBody; +import org.openapitools.client.ProgressResponseBody; import com.google.gson.reflect.TypeToken; import java.io.IOException; +import org.openapitools.client.model.ERRORUNKNOWN; import java.lang.reflect.Type; import java.util.ArrayList; @@ -55,14 +56,14 @@ public class FakeApi { /** * Build call for testCodeInjectEndRnNR - * @param testCodeInjectEndRnNR To test code injection *_/ ' \" =end -- \\r\\n \\n \\r (optional) + * @param UNKNOWN_BASE_TYPE (optional) * @param progressListener Progress listener * @param progressRequestListener Progress request listener * @return Call to execute * @throws ApiException If fail to serialize the request body object */ - public com.squareup.okhttp.Call testCodeInjectEndRnNRCall(String testCodeInjectEndRnNR, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException { - Object localVarPostBody = null; + public com.squareup.okhttp.Call testCodeInjectEndRnNRCall(ERRORUNKNOWN UNKNOWN_BASE_TYPE, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException { + Object localVarPostBody = UNKNOWN_BASE_TYPE; // create path and map variables String localVarPath = "/fake"; @@ -73,11 +74,9 @@ public class FakeApi { Map localVarHeaderParams = new HashMap(); Map localVarFormParams = new HashMap(); - if (testCodeInjectEndRnNR != null) - localVarFormParams.put("test code inject */ ' " =end -- \r\n \n \r", testCodeInjectEndRnNR); final String[] localVarAccepts = { - "application/json", "*_/ ' =end -- " + }; final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept); @@ -105,10 +104,10 @@ public class FakeApi { } @SuppressWarnings("rawtypes") - private com.squareup.okhttp.Call testCodeInjectEndRnNRValidateBeforeCall(String testCodeInjectEndRnNR, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException { + private com.squareup.okhttp.Call testCodeInjectEndRnNRValidateBeforeCall(ERRORUNKNOWN UNKNOWN_BASE_TYPE, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException { - com.squareup.okhttp.Call call = testCodeInjectEndRnNRCall(testCodeInjectEndRnNR, progressListener, progressRequestListener); + com.squareup.okhttp.Call call = testCodeInjectEndRnNRCall(UNKNOWN_BASE_TYPE, progressListener, progressRequestListener); return call; } @@ -116,34 +115,34 @@ public class FakeApi { /** * To test code injection *_/ ' \" =end -- \\r\\n \\n \\r * - * @param testCodeInjectEndRnNR To test code injection *_/ ' \" =end -- \\r\\n \\n \\r (optional) + * @param UNKNOWN_BASE_TYPE (optional) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body */ - public void testCodeInjectEndRnNR(String testCodeInjectEndRnNR) throws ApiException { - testCodeInjectEndRnNRWithHttpInfo(testCodeInjectEndRnNR); + public void testCodeInjectEndRnNR(ERRORUNKNOWN UNKNOWN_BASE_TYPE) throws ApiException { + testCodeInjectEndRnNRWithHttpInfo(UNKNOWN_BASE_TYPE); } /** * To test code injection *_/ ' \" =end -- \\r\\n \\n \\r * - * @param testCodeInjectEndRnNR To test code injection *_/ ' \" =end -- \\r\\n \\n \\r (optional) + * @param UNKNOWN_BASE_TYPE (optional) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body */ - public ApiResponse testCodeInjectEndRnNRWithHttpInfo(String testCodeInjectEndRnNR) throws ApiException { - com.squareup.okhttp.Call call = testCodeInjectEndRnNRValidateBeforeCall(testCodeInjectEndRnNR, null, null); + public ApiResponse testCodeInjectEndRnNRWithHttpInfo(ERRORUNKNOWN UNKNOWN_BASE_TYPE) throws ApiException { + com.squareup.okhttp.Call call = testCodeInjectEndRnNRValidateBeforeCall(UNKNOWN_BASE_TYPE, null, null); return apiClient.execute(call); } /** * To test code injection *_/ ' \" =end -- \\r\\n \\n \\r (asynchronously) * - * @param testCodeInjectEndRnNR To test code injection *_/ ' \" =end -- \\r\\n \\n \\r (optional) + * @param UNKNOWN_BASE_TYPE (optional) * @param callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object */ - public com.squareup.okhttp.Call testCodeInjectEndRnNRAsync(String testCodeInjectEndRnNR, final ApiCallback callback) throws ApiException { + public com.squareup.okhttp.Call testCodeInjectEndRnNRAsync(ERRORUNKNOWN UNKNOWN_BASE_TYPE, final ApiCallback callback) throws ApiException { ProgressResponseBody.ProgressListener progressListener = null; ProgressRequestBody.ProgressRequestListener progressRequestListener = null; @@ -164,7 +163,7 @@ public class FakeApi { }; } - com.squareup.okhttp.Call call = testCodeInjectEndRnNRValidateBeforeCall(testCodeInjectEndRnNR, progressListener, progressRequestListener); + com.squareup.okhttp.Call call = testCodeInjectEndRnNRValidateBeforeCall(UNKNOWN_BASE_TYPE, progressListener, progressRequestListener); apiClient.executeAsync(call, callback); return call; } diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java similarity index 88% rename from samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java rename to samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java index 643d5523f05..558dcffff0d 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java @@ -5,15 +5,15 @@ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r * - * 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-security-test/java/okhttp-gson/src/main/java/io/swagger/client/auth/Authentication.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/auth/Authentication.java similarity index 79% rename from samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/auth/Authentication.java rename to samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/auth/Authentication.java index 3b116e7cf41..cb365111f86 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/auth/Authentication.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/auth/Authentication.java @@ -5,15 +5,15 @@ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r * - * 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-security-test/java/okhttp-gson/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java similarity index 86% rename from samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/auth/HttpBasicAuth.java rename to samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java index 893465d5f43..fd0f44983de 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/auth/HttpBasicAuth.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java @@ -5,15 +5,15 @@ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r * - * 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 com.squareup.okhttp.Credentials; diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/auth/OAuth.java similarity index 81% rename from samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java rename to samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/auth/OAuth.java index 2a1e2a523ca..2dcc0b7610a 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/auth/OAuth.java @@ -5,15 +5,15 @@ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r * - * 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-security-test/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuthFlow.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/auth/OAuthFlow.java similarity index 74% rename from samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuthFlow.java rename to samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/auth/OAuthFlow.java index 2a88e57bb6a..db66a914a09 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuthFlow.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/auth/OAuthFlow.java @@ -5,13 +5,13 @@ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r * - * 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; public enum OAuthFlow { accessCode, implicit, password, application diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java similarity index 92% rename from samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java rename to samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java index 3f716d81dfd..71a1146ccf8 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -5,15 +5,16 @@ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r * - * 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.Objects; +import java.util.Arrays; import com.google.gson.TypeAdapter; import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.SerializedName; diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/test/java/io/swagger/client/api/FakeApiTest.java b/samples/client/petstore-security-test/java/okhttp-gson/src/test/java/io/swagger/client/api/FakeApiTest.java deleted file mode 100644 index 62af85bbbad..00000000000 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/test/java/io/swagger/client/api/FakeApiTest.java +++ /dev/null @@ -1,60 +0,0 @@ -/** - * Swagger Petstore ' \" =end - * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ ' \" =end - * - * OpenAPI spec version: 1.0.0 ' \" =end - * Contact: apiteam@swagger.io ' \" =end - * - * 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.api; - -import io.swagger.client.ApiException; -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(); - - - /** - * To test code injection ' \" =end - * - * - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void testCodeInjectEndTest() throws ApiException { - String testCodeInjectEnd = null; - // api.testCodeInjectEnd(testCodeInjectEnd); - - // TODO: test validations - } - -} diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore-security-test/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java new file mode 100644 index 00000000000..a2a4a7a4119 --- /dev/null +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java @@ -0,0 +1,51 @@ +/* + * Swagger Petstore *_/ ' \" =end -- \\r\\n \\n \\r + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ *_/ ' \" =end -- + * + * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r + * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.api; + +import org.openapitools.client.ApiException; +import org.openapitools.client.model.ERRORUNKNOWN; +import org.junit.Test; +import org.junit.Ignore; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * API tests for FakeApi + */ +@Ignore +public class FakeApiTest { + + private final FakeApi api = new FakeApi(); + + + /** + * To test code injection *_/ ' \" =end -- \\r\\n \\n \\r + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + public void testCodeInjectEndRnNRTest() throws ApiException { + ERRORUNKNOWN UNKNOWN_BASE_TYPE = null; + api.testCodeInjectEndRnNR(UNKNOWN_BASE_TYPE); + + // TODO: test validations + } + +} diff --git a/samples/client/petstore/jaxrs-cxf/.openapi-generator-ignore b/samples/client/petstore/jaxrs-cxf/.openapi-generator-ignore deleted file mode 100644 index c5fa491b4c5..00000000000 --- a/samples/client/petstore/jaxrs-cxf/.openapi-generator-ignore +++ /dev/null @@ -1,23 +0,0 @@ -# Swagger Codegen Ignore -# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen - -# 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: -#ApiClient.cs - -# You can match any string of characters against a directory, file or extension with a single asterisk (*): -#foo/*/qux -# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux - -# You can recursively match patterns against a directory, file or extension with a double asterisk (**): -#foo/**/qux -# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux - -# You can also negate patterns with an exclamation (!). -# For example, you can ignore all files in a docs folder with the file extension .md: -#docs/*.md -# Then explicitly reverse the ignore rule for a single file: -#!docs/README.md diff --git a/samples/client/petstore/jaxrs-cxf/pom.xml b/samples/client/petstore/jaxrs-cxf/pom.xml deleted file mode 100644 index 73d0c914e38..00000000000 --- a/samples/client/petstore/jaxrs-cxf/pom.xml +++ /dev/null @@ -1,174 +0,0 @@ - - 4.0.0 - io.swagger - swagger-jaxrs-client - jar - swagger-jaxrs-client - 1.0.0 - - src/main/java - - - maven-failsafe-plugin - 2.6 - - - - integration-test - verify - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - add-source - generate-sources - - add-source - - - - src/gen/java - - - - - - - - - - io.swagger - swagger-jaxrs - compile - ${swagger-core-version} - - - ch.qos.logback - logback-classic - ${logback-version} - compile - - - ch.qos.logback - logback-core - ${logback-version} - compile - - - junit - junit - ${junit-version} - test - - - - org.apache.cxf - cxf-rt-rs-client - ${cxf-version} - test - - - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf-version} - compile - - - org.apache.cxf - cxf-rt-rs-service-description - ${cxf-version} - compile - - - org.apache.cxf - cxf-rt-ws-policy - ${cxf-version} - compile - - - org.apache.cxf - cxf-rt-wsdl - ${cxf-version} - compile - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson-jaxrs-version} - compile - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - ${jackson-jaxrs-version} - compile - - - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - true - - - - - 1.7 - ${java.version} - ${java.version} - 1.5.18 - 9.2.9.v20150224 - 4.12 - 1.1.7 - 2.5 - 3.2.1 - 2.9.1 - UTF-8 - - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/FakeApi.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/FakeApi.java deleted file mode 100644 index e904e888547..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/FakeApi.java +++ /dev/null @@ -1,45 +0,0 @@ -package io.swagger.api; - -import java.math.BigDecimal; -import io.swagger.model.Client; -import org.joda.time.LocalDate; - -import java.io.InputStream; -import java.io.OutputStream; -import java.util.List; -import java.util.Map; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.jaxrs.PATCH; - -@Path("/") -@Api(value = "/", description = "") -public interface FakeApi { - - @PATCH - @Path("/fake") - @Consumes({ "application/json" }) - @Produces({ "application/json" }) - @ApiOperation(value = "To test \"client\" model", tags={ }) - public Client testClientModel(Client body); - - @POST - @Path("/fake") - @Consumes({ "application/xml; charset=utf-8", "application/json; charset=utf-8" }) - @Produces({ "application/xml; charset=utf-8", "application/json; charset=utf-8" }) - @ApiOperation(value = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 ", tags={ }) - public void testEndpointParameters(@Multipart(value = "number") BigDecimal number, @Multipart(value = "_double") Double _double, @Multipart(value = "patternWithoutDelimiter") String patternWithoutDelimiter, @Multipart(value = "_byte") byte[] _byte, @Multipart(value = "integer", required = false) Integer integer, @Multipart(value = "int32", required = false) Integer int32, @Multipart(value = "int64", required = false) Long int64, @Multipart(value = "_float", required = false) Float _float, @Multipart(value = "string", required = false) String string, @Multipart(value = "binary", required = false) byte[] binary, @Multipart(value = "date", required = false) LocalDate date, @Multipart(value = "dateTime", required = false) javax.xml.datatype.XMLGregorianCalendar dateTime, @Multipart(value = "password", required = false) String password, @Multipart(value = "paramCallback", required = false) String paramCallback); - - @GET - @Path("/fake") - @Consumes({ "*/*" }) - @Produces({ "*/*" }) - @ApiOperation(value = "To test enum parameters", tags={ }) - public void testEnumParameters(@Multipart(value = "enumFormStringArray", required = false) List enumFormStringArray, @Multipart(value = "enumFormString", required = false) String enumFormString, @HeaderParam("enum_header_string_array") List enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array")List enumQueryStringArray, @QueryParam("enum_query_string")String enumQueryString, @QueryParam("enum_query_integer")Integer enumQueryInteger, @Multipart(value = "enumQueryDouble", required = false) Double enumQueryDouble); -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/PetApi.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/PetApi.java deleted file mode 100644 index 73c002077a3..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/PetApi.java +++ /dev/null @@ -1,76 +0,0 @@ -package io.swagger.api; - -import java.io.File; -import io.swagger.model.ModelApiResponse; -import io.swagger.model.Pet; - -import java.io.InputStream; -import java.io.OutputStream; -import java.util.List; -import java.util.Map; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.jaxrs.PATCH; - -@Path("/") -@Api(value = "/", description = "") -public interface PetApi { - - @POST - @Path("/pet") - @Consumes({ "application/json", "application/xml" }) - @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Add a new pet to the store", tags={ }) - public void addPet(Pet body); - - @DELETE - @Path("/pet/{petId}") - @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Deletes a pet", tags={ }) - public void deletePet(@PathParam("petId") Long petId, @HeaderParam("api_key") String apiKey); - - @GET - @Path("/pet/findByStatus") - @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Finds Pets by status", tags={ }) - public List> findPetsByStatus(@QueryParam("status")List status); - - @GET - @Path("/pet/findByTags") - @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Finds Pets by tags", tags={ }) - public List> findPetsByTags(@QueryParam("tags")List tags); - - @GET - @Path("/pet/{petId}") - @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Find pet by ID", tags={ }) - public Pet getPetById(@PathParam("petId") Long petId); - - @PUT - @Path("/pet") - @Consumes({ "application/json", "application/xml" }) - @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Update an existing pet", tags={ }) - public void updatePet(Pet body); - - @POST - @Path("/pet/{petId}") - @Consumes({ "application/x-www-form-urlencoded" }) - @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Updates a pet in the store with form data", tags={ }) - public void updatePetWithForm(@PathParam("petId") Long petId, @Multipart(value = "name", required = false) String name, @Multipart(value = "status", required = false) String status); - - @POST - @Path("/pet/{petId}/uploadImage") - @Consumes({ "multipart/form-data" }) - @Produces({ "application/json" }) - @ApiOperation(value = "uploads an image", tags={ }) - public ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false) String additionalMetadata, @Multipart(value = "file" , required = false) Attachment fileDetail); -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/StoreApi.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/StoreApi.java deleted file mode 100644 index c162a456b28..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/StoreApi.java +++ /dev/null @@ -1,46 +0,0 @@ -package io.swagger.api; - -import io.swagger.model.Order; - -import java.io.InputStream; -import java.io.OutputStream; -import java.util.List; -import java.util.Map; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.jaxrs.PATCH; - -@Path("/") -@Api(value = "/", description = "") -public interface StoreApi { - - @DELETE - @Path("/store/order/{orderId}") - @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Delete purchase order by ID", tags={ }) - public void deleteOrder(@PathParam("orderId") String orderId); - - @GET - @Path("/store/inventory") - @Produces({ "application/json" }) - @ApiOperation(value = "Returns pet inventories by status", tags={ }) - public Map> getInventory(); - - @GET - @Path("/store/order/{orderId}") - @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Find purchase order by ID", tags={ }) - public Order getOrderById(@PathParam("orderId") Long orderId); - - @POST - @Path("/store/order") - @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Place an order for a pet", tags={ }) - public Order placeOrder(Order body); -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/UserApi.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/UserApi.java deleted file mode 100644 index 91dd35454ed..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/UserApi.java +++ /dev/null @@ -1,70 +0,0 @@ -package io.swagger.api; - -import io.swagger.model.User; - -import java.io.InputStream; -import java.io.OutputStream; -import java.util.List; -import java.util.Map; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.jaxrs.PATCH; - -@Path("/") -@Api(value = "/", description = "") -public interface UserApi { - - @POST - @Path("/user") - @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Create user", tags={ }) - public void createUser(User body); - - @POST - @Path("/user/createWithArray") - @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Creates list of users with given input array", tags={ }) - public void createUsersWithArrayInput(List body); - - @POST - @Path("/user/createWithList") - @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Creates list of users with given input array", tags={ }) - public void createUsersWithListInput(List body); - - @DELETE - @Path("/user/{username}") - @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Delete user", tags={ }) - public void deleteUser(@PathParam("username") String username); - - @GET - @Path("/user/{username}") - @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Get user by user name", tags={ }) - public User getUserByName(@PathParam("username") String username); - - @GET - @Path("/user/login") - @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Logs user into the system", tags={ }) - public String loginUser(@QueryParam("username")String username, @QueryParam("password")String password); - - @GET - @Path("/user/logout") - @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Logs out current logged in user session", tags={ }) - public void logoutUser(); - - @PUT - @Path("/user/{username}") - @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Updated user", tags={ }) - public void updateUser(@PathParam("username") String username, User body); -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java deleted file mode 100644 index 1f8f92829fa..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java +++ /dev/null @@ -1,90 +0,0 @@ -package io.swagger.model; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class AdditionalPropertiesClass { - - @ApiModelProperty(example = "null", value = "") - private Map mapProperty = new HashMap(); - @ApiModelProperty(example = "null", value = "") - private Map> mapOfMapProperty = new HashMap>(); - - /** - * Get mapProperty - * @return mapProperty - **/ - public Map getMapProperty() { - return mapProperty; - } - - public void setMapProperty(Map mapProperty) { - this.mapProperty = mapProperty; - } - - public AdditionalPropertiesClass mapProperty(Map mapProperty) { - this.mapProperty = mapProperty; - return this; - } - - public AdditionalPropertiesClass putMapPropertyItem(String key, String mapPropertyItem) { - this.mapProperty.put(key, mapPropertyItem); - return this; - } - - /** - * Get mapOfMapProperty - * @return mapOfMapProperty - **/ - public Map> getMapOfMapProperty() { - return mapOfMapProperty; - } - - public void setMapOfMapProperty(Map> mapOfMapProperty) { - this.mapOfMapProperty = mapOfMapProperty; - } - - public AdditionalPropertiesClass mapOfMapProperty(Map> mapOfMapProperty) { - this.mapOfMapProperty = mapOfMapProperty; - return this; - } - - public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map mapOfMapPropertyItem) { - this.mapOfMapProperty.put(key, mapOfMapPropertyItem); - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AdditionalPropertiesClass {\n"); - - sb.append(" mapProperty: ").append(toIndentedString(mapProperty)).append("\n"); - sb.append(" mapOfMapProperty: ").append(toIndentedString(mapOfMapProperty)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Animal.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Animal.java deleted file mode 100644 index 1b910d07fd8..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Animal.java +++ /dev/null @@ -1,77 +0,0 @@ -package io.swagger.model; - - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class Animal { - - @ApiModelProperty(example = "null", required = true, value = "") - private String className = null; - @ApiModelProperty(example = "null", value = "") - private String color = "red"; - - /** - * Get className - * @return className - **/ - public String getClassName() { - return className; - } - - public void setClassName(String className) { - this.className = className; - } - - public Animal className(String className) { - this.className = className; - return this; - } - - /** - * Get color - * @return color - **/ - public String getColor() { - return color; - } - - public void setColor(String color) { - this.color = color; - } - - public Animal color(String color) { - this.color = color; - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Animal {\n"); - - sb.append(" className: ").append(toIndentedString(className)).append("\n"); - sb.append(" color: ").append(toIndentedString(color)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/AnimalFarm.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/AnimalFarm.java deleted file mode 100644 index 3605a9f929d..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/AnimalFarm.java +++ /dev/null @@ -1,40 +0,0 @@ -package io.swagger.model; - -import io.swagger.model.Animal; -import java.util.ArrayList; -import java.util.List; - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class AnimalFarm extends ArrayList { - - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AnimalFarm {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java deleted file mode 100644 index 0c503dd7905..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java +++ /dev/null @@ -1,65 +0,0 @@ -package io.swagger.model; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class ArrayOfArrayOfNumberOnly { - - @ApiModelProperty(example = "null", value = "") - private List> arrayArrayNumber = new ArrayList>(); - - /** - * Get arrayArrayNumber - * @return arrayArrayNumber - **/ - public List> getArrayArrayNumber() { - return arrayArrayNumber; - } - - public void setArrayArrayNumber(List> arrayArrayNumber) { - this.arrayArrayNumber = arrayArrayNumber; - } - - public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArrayNumber) { - this.arrayArrayNumber = arrayArrayNumber; - return this; - } - - public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayArrayNumberItem) { - this.arrayArrayNumber.add(arrayArrayNumberItem); - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ArrayOfArrayOfNumberOnly {\n"); - - sb.append(" arrayArrayNumber: ").append(toIndentedString(arrayArrayNumber)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java deleted file mode 100644 index d9715d924e0..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java +++ /dev/null @@ -1,65 +0,0 @@ -package io.swagger.model; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class ArrayOfNumberOnly { - - @ApiModelProperty(example = "null", value = "") - private List arrayNumber = new ArrayList(); - - /** - * Get arrayNumber - * @return arrayNumber - **/ - public List getArrayNumber() { - return arrayNumber; - } - - public void setArrayNumber(List arrayNumber) { - this.arrayNumber = arrayNumber; - } - - public ArrayOfNumberOnly arrayNumber(List arrayNumber) { - this.arrayNumber = arrayNumber; - return this; - } - - public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { - this.arrayNumber.add(arrayNumberItem); - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ArrayOfNumberOnly {\n"); - - sb.append(" arrayNumber: ").append(toIndentedString(arrayNumber)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayTest.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayTest.java deleted file mode 100644 index 10d33ff8d46..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayTest.java +++ /dev/null @@ -1,115 +0,0 @@ -package io.swagger.model; - -import io.swagger.model.ReadOnlyFirst; -import java.util.ArrayList; -import java.util.List; - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class ArrayTest { - - @ApiModelProperty(example = "null", value = "") - private List arrayOfString = new ArrayList(); - @ApiModelProperty(example = "null", value = "") - private List> arrayArrayOfInteger = new ArrayList>(); - @ApiModelProperty(example = "null", value = "") - private List> arrayArrayOfModel = new ArrayList>(); - - /** - * Get arrayOfString - * @return arrayOfString - **/ - public List getArrayOfString() { - return arrayOfString; - } - - public void setArrayOfString(List arrayOfString) { - this.arrayOfString = arrayOfString; - } - - public ArrayTest arrayOfString(List arrayOfString) { - this.arrayOfString = arrayOfString; - return this; - } - - public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { - this.arrayOfString.add(arrayOfStringItem); - return this; - } - - /** - * Get arrayArrayOfInteger - * @return arrayArrayOfInteger - **/ - public List> getArrayArrayOfInteger() { - return arrayArrayOfInteger; - } - - public void setArrayArrayOfInteger(List> arrayArrayOfInteger) { - this.arrayArrayOfInteger = arrayArrayOfInteger; - } - - public ArrayTest arrayArrayOfInteger(List> arrayArrayOfInteger) { - this.arrayArrayOfInteger = arrayArrayOfInteger; - return this; - } - - public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) { - this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem); - return this; - } - - /** - * Get arrayArrayOfModel - * @return arrayArrayOfModel - **/ - public List> getArrayArrayOfModel() { - return arrayArrayOfModel; - } - - public void setArrayArrayOfModel(List> arrayArrayOfModel) { - this.arrayArrayOfModel = arrayArrayOfModel; - } - - public ArrayTest arrayArrayOfModel(List> arrayArrayOfModel) { - this.arrayArrayOfModel = arrayArrayOfModel; - return this; - } - - public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelItem) { - this.arrayArrayOfModel.add(arrayArrayOfModelItem); - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ArrayTest {\n"); - - sb.append(" arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n"); - sb.append(" arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n"); - sb.append(" arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Capitalization.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Capitalization.java deleted file mode 100644 index bedd5be84d1..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Capitalization.java +++ /dev/null @@ -1,157 +0,0 @@ -package io.swagger.model; - - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class Capitalization { - - @ApiModelProperty(example = "null", value = "") - private String smallCamel = null; - @ApiModelProperty(example = "null", value = "") - private String capitalCamel = null; - @ApiModelProperty(example = "null", value = "") - private String smallSnake = null; - @ApiModelProperty(example = "null", value = "") - private String capitalSnake = null; - @ApiModelProperty(example = "null", value = "") - private String scAETHFlowPoints = null; - @ApiModelProperty(example = "null", value = "Name of the pet ") - private String ATT_NAME = null; - - /** - * Get smallCamel - * @return smallCamel - **/ - public String getSmallCamel() { - return smallCamel; - } - - public void setSmallCamel(String smallCamel) { - this.smallCamel = smallCamel; - } - - public Capitalization smallCamel(String smallCamel) { - this.smallCamel = smallCamel; - return this; - } - - /** - * Get capitalCamel - * @return capitalCamel - **/ - public String getCapitalCamel() { - return capitalCamel; - } - - public void setCapitalCamel(String capitalCamel) { - this.capitalCamel = capitalCamel; - } - - public Capitalization capitalCamel(String capitalCamel) { - this.capitalCamel = capitalCamel; - return this; - } - - /** - * Get smallSnake - * @return smallSnake - **/ - public String getSmallSnake() { - return smallSnake; - } - - public void setSmallSnake(String smallSnake) { - this.smallSnake = smallSnake; - } - - public Capitalization smallSnake(String smallSnake) { - this.smallSnake = smallSnake; - return this; - } - - /** - * Get capitalSnake - * @return capitalSnake - **/ - public String getCapitalSnake() { - return capitalSnake; - } - - public void setCapitalSnake(String capitalSnake) { - this.capitalSnake = capitalSnake; - } - - public Capitalization capitalSnake(String capitalSnake) { - this.capitalSnake = capitalSnake; - return this; - } - - /** - * Get scAETHFlowPoints - * @return scAETHFlowPoints - **/ - public String getScAETHFlowPoints() { - return scAETHFlowPoints; - } - - public void setScAETHFlowPoints(String scAETHFlowPoints) { - this.scAETHFlowPoints = scAETHFlowPoints; - } - - public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { - this.scAETHFlowPoints = scAETHFlowPoints; - return this; - } - - /** - * Name of the pet - * @return ATT_NAME - **/ - public String getATTNAME() { - return ATT_NAME; - } - - public void setATTNAME(String ATT_NAME) { - this.ATT_NAME = ATT_NAME; - } - - public Capitalization ATT_NAME(String ATT_NAME) { - this.ATT_NAME = ATT_NAME; - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Capitalization {\n"); - - sb.append(" smallCamel: ").append(toIndentedString(smallCamel)).append("\n"); - sb.append(" capitalCamel: ").append(toIndentedString(capitalCamel)).append("\n"); - sb.append(" smallSnake: ").append(toIndentedString(smallSnake)).append("\n"); - sb.append(" capitalSnake: ").append(toIndentedString(capitalSnake)).append("\n"); - sb.append(" scAETHFlowPoints: ").append(toIndentedString(scAETHFlowPoints)).append("\n"); - sb.append(" ATT_NAME: ").append(toIndentedString(ATT_NAME)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Cat.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Cat.java deleted file mode 100644 index d5a34f8cf60..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Cat.java +++ /dev/null @@ -1,58 +0,0 @@ -package io.swagger.model; - -import io.swagger.model.Animal; - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class Cat extends Animal { - - @ApiModelProperty(example = "null", value = "") - private Boolean declawed = null; - - /** - * Get declawed - * @return declawed - **/ - public Boolean getDeclawed() { - return declawed; - } - - public void setDeclawed(Boolean declawed) { - this.declawed = declawed; - } - - public Cat declawed(Boolean declawed) { - this.declawed = declawed; - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Cat {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" declawed: ").append(toIndentedString(declawed)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Category.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Category.java deleted file mode 100644 index 152a402a980..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Category.java +++ /dev/null @@ -1,77 +0,0 @@ -package io.swagger.model; - - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class Category { - - @ApiModelProperty(example = "null", value = "") - private Long id = null; - @ApiModelProperty(example = "null", value = "") - private String name = null; - - /** - * Get id - * @return id - **/ - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Category id(Long id) { - this.id = id; - return this; - } - - /** - * Get name - * @return name - **/ - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Category name(String name) { - this.name = name; - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Category {\n"); - - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ClassModel.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ClassModel.java deleted file mode 100644 index 19a210a6280..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ClassModel.java +++ /dev/null @@ -1,59 +0,0 @@ -package io.swagger.model; - -import io.swagger.annotations.ApiModel; - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -@ApiModel(description="Model for testing model with \"_class\" property") -public class ClassModel { - - @ApiModelProperty(example = "null", value = "") - private String propertyClass = null; - - /** - * Get propertyClass - * @return propertyClass - **/ - public String getPropertyClass() { - return propertyClass; - } - - public void setPropertyClass(String propertyClass) { - this.propertyClass = propertyClass; - } - - public ClassModel propertyClass(String propertyClass) { - this.propertyClass = propertyClass; - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ClassModel {\n"); - - sb.append(" propertyClass: ").append(toIndentedString(propertyClass)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Client.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Client.java deleted file mode 100644 index 13f726f169a..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Client.java +++ /dev/null @@ -1,57 +0,0 @@ -package io.swagger.model; - - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class Client { - - @ApiModelProperty(example = "null", value = "") - private String client = null; - - /** - * Get client - * @return client - **/ - public String getClient() { - return client; - } - - public void setClient(String client) { - this.client = client; - } - - public Client client(String client) { - this.client = client; - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Client {\n"); - - sb.append(" client: ").append(toIndentedString(client)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Dog.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Dog.java deleted file mode 100644 index 79d192044b9..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Dog.java +++ /dev/null @@ -1,58 +0,0 @@ -package io.swagger.model; - -import io.swagger.model.Animal; - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class Dog extends Animal { - - @ApiModelProperty(example = "null", value = "") - private String breed = null; - - /** - * Get breed - * @return breed - **/ - public String getBreed() { - return breed; - } - - public void setBreed(String breed) { - this.breed = breed; - } - - public Dog breed(String breed) { - this.breed = breed; - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Dog {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" breed: ").append(toIndentedString(breed)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumArrays.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumArrays.java deleted file mode 100644 index abd5edd8a11..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumArrays.java +++ /dev/null @@ -1,150 +0,0 @@ -package io.swagger.model; - -import java.util.ArrayList; -import java.util.List; - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class EnumArrays { - - -@XmlType(name="JustSymbolEnum") -@XmlEnum(String.class) -public enum JustSymbolEnum { - -@XmlEnumValue(">=") GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")), @XmlEnumValue("$") DOLLAR(String.valueOf("$")); - - - private String value; - - JustSymbolEnum (String v) { - value = v; - } - - public String value() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - public static JustSymbolEnum fromValue(String v) { - for (JustSymbolEnum b : JustSymbolEnum.values()) { - if (String.valueOf(b.value).equals(v)) { - return b; - } - } - return null; - } -} - - @ApiModelProperty(example = "null", value = "") - private JustSymbolEnum justSymbol = null; - -@XmlType(name="ArrayEnumEnum") -@XmlEnum(String.class) -public enum ArrayEnumEnum { - -@XmlEnumValue("fish") FISH(String.valueOf("fish")), @XmlEnumValue("crab") CRAB(String.valueOf("crab")); - - - private String value; - - ArrayEnumEnum (String v) { - value = v; - } - - public String value() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - public static ArrayEnumEnum fromValue(String v) { - for (ArrayEnumEnum b : ArrayEnumEnum.values()) { - if (String.valueOf(b.value).equals(v)) { - return b; - } - } - return null; - } -} - - @ApiModelProperty(example = "null", value = "") - private List arrayEnum = new ArrayList(); - - /** - * Get justSymbol - * @return justSymbol - **/ - public JustSymbolEnum getJustSymbol() { - return justSymbol; - } - - public void setJustSymbol(JustSymbolEnum justSymbol) { - this.justSymbol = justSymbol; - } - - public EnumArrays justSymbol(JustSymbolEnum justSymbol) { - this.justSymbol = justSymbol; - return this; - } - - /** - * Get arrayEnum - * @return arrayEnum - **/ - public List getArrayEnum() { - return arrayEnum; - } - - public void setArrayEnum(List arrayEnum) { - this.arrayEnum = arrayEnum; - } - - public EnumArrays arrayEnum(List arrayEnum) { - this.arrayEnum = arrayEnum; - return this; - } - - public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { - this.arrayEnum.add(arrayEnumItem); - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class EnumArrays {\n"); - - sb.append(" justSymbol: ").append(toIndentedString(justSymbol)).append("\n"); - sb.append(" arrayEnum: ").append(toIndentedString(arrayEnum)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumClass.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumClass.java deleted file mode 100644 index 291878a42cd..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumClass.java +++ /dev/null @@ -1,37 +0,0 @@ -package io.swagger.model; - - - -/** - * Gets or Sets EnumClass - */ -public enum EnumClass { - - _ABC("_abc"), - - _EFG("-efg"), - - _XYZ_("(xyz)"); - - private String value; - - EnumClass(String value) { - this.value = value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - public static EnumClass fromValue(String text) { - for (EnumClass b : EnumClass.values()) { - if (String.valueOf(b.value).equals(text)) { - return b; - } - } - return null; - } - -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumTest.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumTest.java deleted file mode 100644 index 9bf0ed480d9..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumTest.java +++ /dev/null @@ -1,217 +0,0 @@ -package io.swagger.model; - -import io.swagger.model.OuterEnum; - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class EnumTest { - - -@XmlType(name="EnumStringEnum") -@XmlEnum(String.class) -public enum EnumStringEnum { - -@XmlEnumValue("UPPER") UPPER(String.valueOf("UPPER")), @XmlEnumValue("lower") LOWER(String.valueOf("lower")), @XmlEnumValue("") EMPTY(String.valueOf("")); - - - private String value; - - EnumStringEnum (String v) { - value = v; - } - - public String value() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - public static EnumStringEnum fromValue(String v) { - for (EnumStringEnum b : EnumStringEnum.values()) { - if (String.valueOf(b.value).equals(v)) { - return b; - } - } - return null; - } -} - - @ApiModelProperty(example = "null", value = "") - private EnumStringEnum enumString = null; - -@XmlType(name="EnumIntegerEnum") -@XmlEnum(Integer.class) -public enum EnumIntegerEnum { - -@XmlEnumValue("1") NUMBER_1(Integer.valueOf(1)), @XmlEnumValue("-1") NUMBER_MINUS_1(Integer.valueOf(-1)); - - - private Integer value; - - EnumIntegerEnum (Integer v) { - value = v; - } - - public Integer value() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - public static EnumIntegerEnum fromValue(String v) { - for (EnumIntegerEnum b : EnumIntegerEnum.values()) { - if (String.valueOf(b.value).equals(v)) { - return b; - } - } - return null; - } -} - - @ApiModelProperty(example = "null", value = "") - private EnumIntegerEnum enumInteger = null; - -@XmlType(name="EnumNumberEnum") -@XmlEnum(Double.class) -public enum EnumNumberEnum { - -@XmlEnumValue("1.1") NUMBER_1_DOT_1(Double.valueOf(1.1)), @XmlEnumValue("-1.2") NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2)); - - - private Double value; - - EnumNumberEnum (Double v) { - value = v; - } - - public Double value() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - public static EnumNumberEnum fromValue(String v) { - for (EnumNumberEnum b : EnumNumberEnum.values()) { - if (String.valueOf(b.value).equals(v)) { - return b; - } - } - return null; - } -} - - @ApiModelProperty(example = "null", value = "") - private EnumNumberEnum enumNumber = null; - @ApiModelProperty(example = "null", value = "") - private OuterEnum outerEnum = null; - - /** - * Get enumString - * @return enumString - **/ - public EnumStringEnum getEnumString() { - return enumString; - } - - public void setEnumString(EnumStringEnum enumString) { - this.enumString = enumString; - } - - public EnumTest enumString(EnumStringEnum enumString) { - this.enumString = enumString; - return this; - } - - /** - * Get enumInteger - * @return enumInteger - **/ - public EnumIntegerEnum getEnumInteger() { - return enumInteger; - } - - public void setEnumInteger(EnumIntegerEnum enumInteger) { - this.enumInteger = enumInteger; - } - - public EnumTest enumInteger(EnumIntegerEnum enumInteger) { - this.enumInteger = enumInteger; - return this; - } - - /** - * Get enumNumber - * @return enumNumber - **/ - public EnumNumberEnum getEnumNumber() { - return enumNumber; - } - - public void setEnumNumber(EnumNumberEnum enumNumber) { - this.enumNumber = enumNumber; - } - - public EnumTest enumNumber(EnumNumberEnum enumNumber) { - this.enumNumber = enumNumber; - return this; - } - - /** - * Get outerEnum - * @return outerEnum - **/ - public OuterEnum getOuterEnum() { - return outerEnum; - } - - public void setOuterEnum(OuterEnum outerEnum) { - this.outerEnum = outerEnum; - } - - public EnumTest outerEnum(OuterEnum outerEnum) { - this.outerEnum = outerEnum; - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class EnumTest {\n"); - - sb.append(" enumString: ").append(toIndentedString(enumString)).append("\n"); - sb.append(" enumInteger: ").append(toIndentedString(enumInteger)).append("\n"); - sb.append(" enumNumber: ").append(toIndentedString(enumNumber)).append("\n"); - sb.append(" outerEnum: ").append(toIndentedString(outerEnum)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/FormatTest.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/FormatTest.java deleted file mode 100644 index 7aaa680ee74..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/FormatTest.java +++ /dev/null @@ -1,310 +0,0 @@ -package io.swagger.model; - -import java.math.BigDecimal; -import java.util.UUID; -import org.joda.time.LocalDate; - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class FormatTest { - - @ApiModelProperty(example = "null", value = "") - private Integer integer = null; - @ApiModelProperty(example = "null", value = "") - private Integer int32 = null; - @ApiModelProperty(example = "null", value = "") - private Long int64 = null; - @ApiModelProperty(example = "null", required = true, value = "") - private BigDecimal number = null; - @ApiModelProperty(example = "null", value = "") - private Float _float = null; - @ApiModelProperty(example = "null", value = "") - private Double _double = null; - @ApiModelProperty(example = "null", value = "") - private String string = null; - @ApiModelProperty(example = "null", required = true, value = "") - private byte[] _byte = null; - @ApiModelProperty(example = "null", value = "") - private byte[] binary = null; - @ApiModelProperty(example = "null", required = true, value = "") - private LocalDate date = null; - @ApiModelProperty(example = "null", value = "") - private javax.xml.datatype.XMLGregorianCalendar dateTime = null; - @ApiModelProperty(example = "null", value = "") - private UUID uuid = null; - @ApiModelProperty(example = "null", required = true, value = "") - private String password = null; - - /** - * Get integer - * minimum: 10 - * maximum: 100 - * @return integer - **/ - public Integer getInteger() { - return integer; - } - - public void setInteger(Integer integer) { - this.integer = integer; - } - - public FormatTest integer(Integer integer) { - this.integer = integer; - return this; - } - - /** - * Get int32 - * minimum: 20 - * maximum: 200 - * @return int32 - **/ - public Integer getInt32() { - return int32; - } - - public void setInt32(Integer int32) { - this.int32 = int32; - } - - public FormatTest int32(Integer int32) { - this.int32 = int32; - return this; - } - - /** - * Get int64 - * @return int64 - **/ - public Long getInt64() { - return int64; - } - - public void setInt64(Long int64) { - this.int64 = int64; - } - - public FormatTest int64(Long int64) { - this.int64 = int64; - return this; - } - - /** - * Get number - * minimum: 32.1 - * maximum: 543.2 - * @return number - **/ - public BigDecimal getNumber() { - return number; - } - - public void setNumber(BigDecimal number) { - this.number = number; - } - - public FormatTest number(BigDecimal number) { - this.number = number; - return this; - } - - /** - * Get _float - * minimum: 54.3 - * maximum: 987.6 - * @return _float - **/ - public Float getFloat() { - return _float; - } - - public void setFloat(Float _float) { - this._float = _float; - } - - public FormatTest _float(Float _float) { - this._float = _float; - return this; - } - - /** - * Get _double - * minimum: 67.8 - * maximum: 123.4 - * @return _double - **/ - public Double getDouble() { - return _double; - } - - public void setDouble(Double _double) { - this._double = _double; - } - - public FormatTest _double(Double _double) { - this._double = _double; - return this; - } - - /** - * Get string - * @return string - **/ - public String getString() { - return string; - } - - public void setString(String string) { - this.string = string; - } - - public FormatTest string(String string) { - this.string = string; - return this; - } - - /** - * Get _byte - * @return _byte - **/ - public byte[] getByte() { - return _byte; - } - - public void setByte(byte[] _byte) { - this._byte = _byte; - } - - public FormatTest _byte(byte[] _byte) { - this._byte = _byte; - return this; - } - - /** - * Get binary - * @return binary - **/ - public byte[] getBinary() { - return binary; - } - - public void setBinary(byte[] binary) { - this.binary = binary; - } - - public FormatTest binary(byte[] binary) { - this.binary = binary; - return this; - } - - /** - * Get date - * @return date - **/ - public LocalDate getDate() { - return date; - } - - public void setDate(LocalDate date) { - this.date = date; - } - - public FormatTest date(LocalDate date) { - this.date = date; - return this; - } - - /** - * Get dateTime - * @return dateTime - **/ - public javax.xml.datatype.XMLGregorianCalendar getDateTime() { - return dateTime; - } - - public void setDateTime(javax.xml.datatype.XMLGregorianCalendar dateTime) { - this.dateTime = dateTime; - } - - public FormatTest dateTime(javax.xml.datatype.XMLGregorianCalendar dateTime) { - this.dateTime = dateTime; - return this; - } - - /** - * Get uuid - * @return uuid - **/ - public UUID getUuid() { - return uuid; - } - - public void setUuid(UUID uuid) { - this.uuid = uuid; - } - - public FormatTest uuid(UUID uuid) { - this.uuid = uuid; - return this; - } - - /** - * Get password - * @return password - **/ - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public FormatTest password(String password) { - this.password = password; - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class FormatTest {\n"); - - sb.append(" integer: ").append(toIndentedString(integer)).append("\n"); - sb.append(" int32: ").append(toIndentedString(int32)).append("\n"); - sb.append(" int64: ").append(toIndentedString(int64)).append("\n"); - sb.append(" number: ").append(toIndentedString(number)).append("\n"); - sb.append(" _float: ").append(toIndentedString(_float)).append("\n"); - sb.append(" _double: ").append(toIndentedString(_double)).append("\n"); - sb.append(" string: ").append(toIndentedString(string)).append("\n"); - sb.append(" _byte: ").append(toIndentedString(_byte)).append("\n"); - sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); - sb.append(" date: ").append(toIndentedString(date)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/HasOnlyReadOnly.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/HasOnlyReadOnly.java deleted file mode 100644 index 5217ab51d00..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/HasOnlyReadOnly.java +++ /dev/null @@ -1,61 +0,0 @@ -package io.swagger.model; - - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class HasOnlyReadOnly { - - @ApiModelProperty(example = "null", value = "") - private String bar = null; - @ApiModelProperty(example = "null", value = "") - private String foo = null; - - /** - * Get bar - * @return bar - **/ - public String getBar() { - return bar; - } - - - /** - * Get foo - * @return foo - **/ - public String getFoo() { - return foo; - } - - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class HasOnlyReadOnly {\n"); - - sb.append(" bar: ").append(toIndentedString(bar)).append("\n"); - sb.append(" foo: ").append(toIndentedString(foo)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MapTest.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MapTest.java deleted file mode 100644 index c4a96d6e0cf..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MapTest.java +++ /dev/null @@ -1,123 +0,0 @@ -package io.swagger.model; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class MapTest { - - @ApiModelProperty(example = "null", value = "") - private Map> mapMapOfString = new HashMap>(); - -@XmlType(name="InnerEnum") -@XmlEnum(String.class) -public enum InnerEnum { - -@XmlEnumValue("UPPER") UPPER(String.valueOf("UPPER")), @XmlEnumValue("lower") LOWER(String.valueOf("lower")); - - - private String value; - - InnerEnum (String v) { - value = v; - } - - public String value() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - public static InnerEnum fromValue(String v) { - for (InnerEnum b : InnerEnum.values()) { - if (String.valueOf(b.value).equals(v)) { - return b; - } - } - return null; - } -} - - @ApiModelProperty(example = "null", value = "") - private Map mapOfEnumString = new HashMap(); - - /** - * Get mapMapOfString - * @return mapMapOfString - **/ - public Map> getMapMapOfString() { - return mapMapOfString; - } - - public void setMapMapOfString(Map> mapMapOfString) { - this.mapMapOfString = mapMapOfString; - } - - public MapTest mapMapOfString(Map> mapMapOfString) { - this.mapMapOfString = mapMapOfString; - return this; - } - - public MapTest putMapMapOfStringItem(String key, Map mapMapOfStringItem) { - this.mapMapOfString.put(key, mapMapOfStringItem); - return this; - } - - /** - * Get mapOfEnumString - * @return mapOfEnumString - **/ - public Map getMapOfEnumString() { - return mapOfEnumString; - } - - public void setMapOfEnumString(Map mapOfEnumString) { - this.mapOfEnumString = mapOfEnumString; - } - - public MapTest mapOfEnumString(Map mapOfEnumString) { - this.mapOfEnumString = mapOfEnumString; - return this; - } - - public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) { - this.mapOfEnumString.put(key, mapOfEnumStringItem); - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class MapTest {\n"); - - sb.append(" mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n"); - sb.append(" mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java deleted file mode 100644 index be9766ed322..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ /dev/null @@ -1,107 +0,0 @@ -package io.swagger.model; - -import io.swagger.model.Animal; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class MixedPropertiesAndAdditionalPropertiesClass { - - @ApiModelProperty(example = "null", value = "") - private UUID uuid = null; - @ApiModelProperty(example = "null", value = "") - private javax.xml.datatype.XMLGregorianCalendar dateTime = null; - @ApiModelProperty(example = "null", value = "") - private Map map = new HashMap(); - - /** - * Get uuid - * @return uuid - **/ - public UUID getUuid() { - return uuid; - } - - public void setUuid(UUID uuid) { - this.uuid = uuid; - } - - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { - this.uuid = uuid; - return this; - } - - /** - * Get dateTime - * @return dateTime - **/ - public javax.xml.datatype.XMLGregorianCalendar getDateTime() { - return dateTime; - } - - public void setDateTime(javax.xml.datatype.XMLGregorianCalendar dateTime) { - this.dateTime = dateTime; - } - - public MixedPropertiesAndAdditionalPropertiesClass dateTime(javax.xml.datatype.XMLGregorianCalendar dateTime) { - this.dateTime = dateTime; - return this; - } - - /** - * Get map - * @return map - **/ - public Map getMap() { - return map; - } - - public void setMap(Map map) { - this.map = map; - } - - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { - this.map = map; - return this; - } - - public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { - this.map.put(key, mapItem); - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); - - sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); - sb.append(" map: ").append(toIndentedString(map)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Model200Response.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Model200Response.java deleted file mode 100644 index 05fd797834c..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Model200Response.java +++ /dev/null @@ -1,79 +0,0 @@ -package io.swagger.model; - -import io.swagger.annotations.ApiModel; - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -@ApiModel(description="Model for testing model name starting with number") -public class Model200Response { - - @ApiModelProperty(example = "null", value = "") - private Integer name = null; - @ApiModelProperty(example = "null", value = "") - private String propertyClass = null; - - /** - * Get name - * @return name - **/ - public Integer getName() { - return name; - } - - public void setName(Integer name) { - this.name = name; - } - - public Model200Response name(Integer name) { - this.name = name; - return this; - } - - /** - * Get propertyClass - * @return propertyClass - **/ - public String getPropertyClass() { - return propertyClass; - } - - public void setPropertyClass(String propertyClass) { - this.propertyClass = propertyClass; - } - - public Model200Response propertyClass(String propertyClass) { - this.propertyClass = propertyClass; - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Model200Response {\n"); - - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" propertyClass: ").append(toIndentedString(propertyClass)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelApiResponse.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelApiResponse.java deleted file mode 100644 index c223c815449..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelApiResponse.java +++ /dev/null @@ -1,97 +0,0 @@ -package io.swagger.model; - - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class ModelApiResponse { - - @ApiModelProperty(example = "null", value = "") - private Integer code = null; - @ApiModelProperty(example = "null", value = "") - private String type = null; - @ApiModelProperty(example = "null", value = "") - private String message = null; - - /** - * Get code - * @return code - **/ - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public ModelApiResponse code(Integer code) { - this.code = code; - return this; - } - - /** - * Get type - * @return type - **/ - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public ModelApiResponse type(String type) { - this.type = type; - return this; - } - - /** - * Get message - * @return message - **/ - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public ModelApiResponse message(String message) { - this.message = message; - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ModelApiResponse {\n"); - - sb.append(" code: ").append(toIndentedString(code)).append("\n"); - sb.append(" type: ").append(toIndentedString(type)).append("\n"); - sb.append(" message: ").append(toIndentedString(message)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelReturn.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelReturn.java deleted file mode 100644 index 92945ebdff6..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelReturn.java +++ /dev/null @@ -1,59 +0,0 @@ -package io.swagger.model; - -import io.swagger.annotations.ApiModel; - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -@ApiModel(description="Model for testing reserved words") -public class ModelReturn { - - @ApiModelProperty(example = "null", value = "") - private Integer _return = null; - - /** - * Get _return - * @return _return - **/ - public Integer getReturn() { - return _return; - } - - public void setReturn(Integer _return) { - this._return = _return; - } - - public ModelReturn _return(Integer _return) { - this._return = _return; - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ModelReturn {\n"); - - sb.append(" _return: ").append(toIndentedString(_return)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Name.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Name.java deleted file mode 100644 index 874d6cf18bc..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Name.java +++ /dev/null @@ -1,103 +0,0 @@ -package io.swagger.model; - -import io.swagger.annotations.ApiModel; - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -@ApiModel(description="Model for testing model name same as property name") -public class Name { - - @ApiModelProperty(example = "null", required = true, value = "") - private Integer name = null; - @ApiModelProperty(example = "null", value = "") - private Integer snakeCase = null; - @ApiModelProperty(example = "null", value = "") - private String property = null; - @ApiModelProperty(example = "null", value = "") - private Integer _123Number = null; - - /** - * Get name - * @return name - **/ - public Integer getName() { - return name; - } - - public void setName(Integer name) { - this.name = name; - } - - public Name name(Integer name) { - this.name = name; - return this; - } - - /** - * Get snakeCase - * @return snakeCase - **/ - public Integer getSnakeCase() { - return snakeCase; - } - - - /** - * Get property - * @return property - **/ - public String getProperty() { - return property; - } - - public void setProperty(String property) { - this.property = property; - } - - public Name property(String property) { - this.property = property; - return this; - } - - /** - * Get _123Number - * @return _123Number - **/ - public Integer get123Number() { - return _123Number; - } - - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Name {\n"); - - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" snakeCase: ").append(toIndentedString(snakeCase)).append("\n"); - sb.append(" property: ").append(toIndentedString(property)).append("\n"); - sb.append(" _123Number: ").append(toIndentedString(_123Number)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/NumberOnly.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/NumberOnly.java deleted file mode 100644 index 12b98f1cfa7..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/NumberOnly.java +++ /dev/null @@ -1,58 +0,0 @@ -package io.swagger.model; - -import java.math.BigDecimal; - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class NumberOnly { - - @ApiModelProperty(example = "null", value = "") - private BigDecimal justNumber = null; - - /** - * Get justNumber - * @return justNumber - **/ - public BigDecimal getJustNumber() { - return justNumber; - } - - public void setJustNumber(BigDecimal justNumber) { - this.justNumber = justNumber; - } - - public NumberOnly justNumber(BigDecimal justNumber) { - this.justNumber = justNumber; - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class NumberOnly {\n"); - - sb.append(" justNumber: ").append(toIndentedString(justNumber)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Order.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Order.java deleted file mode 100644 index 121f73715b4..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Order.java +++ /dev/null @@ -1,190 +0,0 @@ -package io.swagger.model; - - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class Order { - - @ApiModelProperty(example = "null", value = "") - private Long id = null; - @ApiModelProperty(example = "null", value = "") - private Long petId = null; - @ApiModelProperty(example = "null", value = "") - private Integer quantity = null; - @ApiModelProperty(example = "null", value = "") - private javax.xml.datatype.XMLGregorianCalendar shipDate = null; - -@XmlType(name="StatusEnum") -@XmlEnum(String.class) -public enum StatusEnum { - -@XmlEnumValue("placed") PLACED(String.valueOf("placed")), @XmlEnumValue("approved") APPROVED(String.valueOf("approved")), @XmlEnumValue("delivered") DELIVERED(String.valueOf("delivered")); - - - private String value; - - StatusEnum (String v) { - value = v; - } - - public String value() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - public static StatusEnum fromValue(String v) { - for (StatusEnum b : StatusEnum.values()) { - if (String.valueOf(b.value).equals(v)) { - return b; - } - } - return null; - } -} - - @ApiModelProperty(example = "null", value = "Order Status") - private StatusEnum status = null; - @ApiModelProperty(example = "null", value = "") - private Boolean complete = false; - - /** - * Get id - * @return id - **/ - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Order id(Long id) { - this.id = id; - return this; - } - - /** - * Get petId - * @return petId - **/ - public Long getPetId() { - return petId; - } - - public void setPetId(Long petId) { - this.petId = petId; - } - - public Order petId(Long petId) { - this.petId = petId; - return this; - } - - /** - * Get quantity - * @return quantity - **/ - public Integer getQuantity() { - return quantity; - } - - public void setQuantity(Integer quantity) { - this.quantity = quantity; - } - - public Order quantity(Integer quantity) { - this.quantity = quantity; - return this; - } - - /** - * Get shipDate - * @return shipDate - **/ - public javax.xml.datatype.XMLGregorianCalendar getShipDate() { - return shipDate; - } - - public void setShipDate(javax.xml.datatype.XMLGregorianCalendar shipDate) { - this.shipDate = shipDate; - } - - public Order shipDate(javax.xml.datatype.XMLGregorianCalendar shipDate) { - this.shipDate = shipDate; - return this; - } - - /** - * Order Status - * @return status - **/ - public StatusEnum getStatus() { - return status; - } - - public void setStatus(StatusEnum status) { - this.status = status; - } - - public Order status(StatusEnum status) { - this.status = status; - return this; - } - - /** - * Get complete - * @return complete - **/ - public Boolean getComplete() { - return complete; - } - - public void setComplete(Boolean complete) { - this.complete = complete; - } - - public Order complete(Boolean complete) { - this.complete = complete; - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Order {\n"); - - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" petId: ").append(toIndentedString(petId)).append("\n"); - sb.append(" quantity: ").append(toIndentedString(quantity)).append("\n"); - sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); - sb.append(" status: ").append(toIndentedString(status)).append("\n"); - sb.append(" complete: ").append(toIndentedString(complete)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/OuterEnum.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/OuterEnum.java deleted file mode 100644 index 29a009eabdd..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/OuterEnum.java +++ /dev/null @@ -1,37 +0,0 @@ -package io.swagger.model; - - - -/** - * Gets or Sets OuterEnum - */ -public enum OuterEnum { - - PLACED("placed"), - - APPROVED("approved"), - - DELIVERED("delivered"); - - private String value; - - OuterEnum(String value) { - this.value = value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - public static OuterEnum fromValue(String text) { - for (OuterEnum b : OuterEnum.values()) { - if (String.valueOf(b.value).equals(text)) { - return b; - } - } - return null; - } - -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Pet.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Pet.java deleted file mode 100644 index 5bca8a1291a..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Pet.java +++ /dev/null @@ -1,204 +0,0 @@ -package io.swagger.model; - -import io.swagger.model.Category; -import io.swagger.model.Tag; -import java.util.ArrayList; -import java.util.List; - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class Pet { - - @ApiModelProperty(example = "null", value = "") - private Long id = null; - @ApiModelProperty(example = "null", value = "") - private Category category = null; - @ApiModelProperty(example = "doggie", required = true, value = "") - private String name = null; - @ApiModelProperty(example = "null", required = true, value = "") - private List photoUrls = new ArrayList(); - @ApiModelProperty(example = "null", value = "") - private List tags = new ArrayList(); - -@XmlType(name="StatusEnum") -@XmlEnum(String.class) -public enum StatusEnum { - -@XmlEnumValue("available") AVAILABLE(String.valueOf("available")), @XmlEnumValue("pending") PENDING(String.valueOf("pending")), @XmlEnumValue("sold") SOLD(String.valueOf("sold")); - - - private String value; - - StatusEnum (String v) { - value = v; - } - - public String value() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - public static StatusEnum fromValue(String v) { - for (StatusEnum b : StatusEnum.values()) { - if (String.valueOf(b.value).equals(v)) { - return b; - } - } - return null; - } -} - - @ApiModelProperty(example = "null", value = "pet status in the store") - private StatusEnum status = null; - - /** - * Get id - * @return id - **/ - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Pet id(Long id) { - this.id = id; - return this; - } - - /** - * Get category - * @return category - **/ - public Category getCategory() { - return category; - } - - public void setCategory(Category category) { - this.category = category; - } - - public Pet category(Category category) { - this.category = category; - return this; - } - - /** - * Get name - * @return name - **/ - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Pet name(String name) { - this.name = name; - return this; - } - - /** - * Get photoUrls - * @return photoUrls - **/ - public List getPhotoUrls() { - return photoUrls; - } - - public void setPhotoUrls(List photoUrls) { - this.photoUrls = photoUrls; - } - - public Pet photoUrls(List photoUrls) { - this.photoUrls = photoUrls; - return this; - } - - public Pet addPhotoUrlsItem(String photoUrlsItem) { - this.photoUrls.add(photoUrlsItem); - return this; - } - - /** - * Get tags - * @return tags - **/ - public List getTags() { - return tags; - } - - public void setTags(List tags) { - this.tags = tags; - } - - public Pet tags(List tags) { - this.tags = tags; - return this; - } - - public Pet addTagsItem(Tag tagsItem) { - this.tags.add(tagsItem); - return this; - } - - /** - * pet status in the store - * @return status - **/ - public StatusEnum getStatus() { - return status; - } - - public void setStatus(StatusEnum status) { - this.status = status; - } - - public Pet status(StatusEnum status) { - this.status = status; - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Pet {\n"); - - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" category: ").append(toIndentedString(category)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" photoUrls: ").append(toIndentedString(photoUrls)).append("\n"); - sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); - sb.append(" status: ").append(toIndentedString(status)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ReadOnlyFirst.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ReadOnlyFirst.java deleted file mode 100644 index f4baea453a2..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ReadOnlyFirst.java +++ /dev/null @@ -1,69 +0,0 @@ -package io.swagger.model; - - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class ReadOnlyFirst { - - @ApiModelProperty(example = "null", value = "") - private String bar = null; - @ApiModelProperty(example = "null", value = "") - private String baz = null; - - /** - * Get bar - * @return bar - **/ - public String getBar() { - return bar; - } - - - /** - * Get baz - * @return baz - **/ - public String getBaz() { - return baz; - } - - public void setBaz(String baz) { - this.baz = baz; - } - - public ReadOnlyFirst baz(String baz) { - this.baz = baz; - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ReadOnlyFirst {\n"); - - sb.append(" bar: ").append(toIndentedString(bar)).append("\n"); - sb.append(" baz: ").append(toIndentedString(baz)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/SpecialModelName.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/SpecialModelName.java deleted file mode 100644 index afff9e4087e..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/SpecialModelName.java +++ /dev/null @@ -1,57 +0,0 @@ -package io.swagger.model; - - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class SpecialModelName { - - @ApiModelProperty(example = "null", value = "") - private Long specialPropertyName = null; - - /** - * Get specialPropertyName - * @return specialPropertyName - **/ - public Long getSpecialPropertyName() { - return specialPropertyName; - } - - public void setSpecialPropertyName(Long specialPropertyName) { - this.specialPropertyName = specialPropertyName; - } - - public SpecialModelName specialPropertyName(Long specialPropertyName) { - this.specialPropertyName = specialPropertyName; - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class SpecialModelName {\n"); - - sb.append(" specialPropertyName: ").append(toIndentedString(specialPropertyName)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Tag.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Tag.java deleted file mode 100644 index fec9ab8820c..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Tag.java +++ /dev/null @@ -1,77 +0,0 @@ -package io.swagger.model; - - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class Tag { - - @ApiModelProperty(example = "null", value = "") - private Long id = null; - @ApiModelProperty(example = "null", value = "") - private String name = null; - - /** - * Get id - * @return id - **/ - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Tag id(Long id) { - this.id = id; - return this; - } - - /** - * Get name - * @return name - **/ - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Tag name(String name) { - this.name = name; - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Tag {\n"); - - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/User.java b/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/User.java deleted file mode 100644 index 0b650614861..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/User.java +++ /dev/null @@ -1,197 +0,0 @@ -package io.swagger.model; - - -import io.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - -public class User { - - @ApiModelProperty(example = "null", value = "") - private Long id = null; - @ApiModelProperty(example = "null", value = "") - private String username = null; - @ApiModelProperty(example = "null", value = "") - private String firstName = null; - @ApiModelProperty(example = "null", value = "") - private String lastName = null; - @ApiModelProperty(example = "null", value = "") - private String email = null; - @ApiModelProperty(example = "null", value = "") - private String password = null; - @ApiModelProperty(example = "null", value = "") - private String phone = null; - @ApiModelProperty(example = "null", value = "User Status") - private Integer userStatus = null; - - /** - * Get id - * @return id - **/ - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public User id(Long id) { - this.id = id; - return this; - } - - /** - * Get username - * @return username - **/ - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public User username(String username) { - this.username = username; - return this; - } - - /** - * Get firstName - * @return firstName - **/ - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public User firstName(String firstName) { - this.firstName = firstName; - return this; - } - - /** - * Get lastName - * @return lastName - **/ - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public User lastName(String lastName) { - this.lastName = lastName; - return this; - } - - /** - * Get email - * @return email - **/ - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public User email(String email) { - this.email = email; - return this; - } - - /** - * Get password - * @return password - **/ - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public User password(String password) { - this.password = password; - return this; - } - - /** - * Get phone - * @return phone - **/ - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public User phone(String phone) { - this.phone = phone; - return this; - } - - /** - * User Status - * @return userStatus - **/ - public Integer getUserStatus() { - return userStatus; - } - - public void setUserStatus(Integer userStatus) { - this.userStatus = userStatus; - } - - public User userStatus(Integer userStatus) { - this.userStatus = userStatus; - return this; - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class User {\n"); - - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" username: ").append(toIndentedString(username)).append("\n"); - sb.append(" firstName: ").append(toIndentedString(firstName)).append("\n"); - sb.append(" lastName: ").append(toIndentedString(lastName)).append("\n"); - sb.append(" email: ").append(toIndentedString(email)).append("\n"); - sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" phone: ").append(toIndentedString(phone)).append("\n"); - sb.append(" userStatus: ").append(toIndentedString(userStatus)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private static String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/client/petstore/jaxrs-cxf/src/test/java/io/swagger/api/FakeApiTest.java b/samples/client/petstore/jaxrs-cxf/src/test/java/io/swagger/api/FakeApiTest.java deleted file mode 100644 index 5e8dae654a4..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/test/java/io/swagger/api/FakeApiTest.java +++ /dev/null @@ -1,146 +0,0 @@ -/** - * 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.api; - -import java.math.BigDecimal; -import io.swagger.model.Client; -import org.joda.time.LocalDate; -import org.junit.Test; -import org.junit.Before; -import static org.junit.Assert.*; - -import javax.ws.rs.core.Response; -import org.apache.cxf.jaxrs.client.JAXRSClientFactory; -import org.apache.cxf.jaxrs.client.ClientConfiguration; -import org.apache.cxf.jaxrs.client.WebClient; - - -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - - - -/** - * API tests for FakeApi - */ -public class FakeApiTest { - - - private FakeApi api; - - @Before - public void setup() { - JacksonJsonProvider provider = new JacksonJsonProvider(); - List providers = new ArrayList(); - providers.add(provider); - - api = JAXRSClientFactory.create("http://petstore.swagger.io/v2", FakeApi.class, providers); - org.apache.cxf.jaxrs.client.Client client = WebClient.client(api); - - ClientConfiguration config = WebClient.getConfig(client); - } - - - /** - * To test \"client\" model - * - * To test \"client\" model - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void testClientModelTest() { - Client body = null; - //Client response = api.testClientModel(body); - //assertNotNull(response); - // TODO: test validations - - - } - - /** - * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * - * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void testEndpointParametersTest() { - BigDecimal number = null; - Double _double = null; - String patternWithoutDelimiter = null; - byte[] _byte = null; - Integer integer = null; - Integer int32 = null; - Long int64 = null; - Float _float = null; - String string = null; - byte[] binary = null; - LocalDate date = null; - javax.xml.datatype.XMLGregorianCalendar dateTime = null; - String password = null; - String paramCallback = null; - //api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); - - // TODO: test validations - - - } - - /** - * To test enum parameters - * - * To test enum parameters - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void testEnumParametersTest() { - List enumFormStringArray = null; - String enumFormString = null; - List enumHeaderStringArray = null; - String enumHeaderString = null; - List enumQueryStringArray = null; - String enumQueryString = null; - Integer enumQueryInteger = null; - Double enumQueryDouble = null; - //api.testEnumParameters(enumFormStringArray, enumFormString, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble); - - // TODO: test validations - - - } - -} diff --git a/samples/client/petstore/jaxrs-cxf/src/test/java/io/swagger/api/PetApiTest.java b/samples/client/petstore/jaxrs-cxf/src/test/java/io/swagger/api/PetApiTest.java deleted file mode 100644 index 8aefa0bc820..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/test/java/io/swagger/api/PetApiTest.java +++ /dev/null @@ -1,221 +0,0 @@ -/** - * 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.api; - -import java.io.File; -import io.swagger.model.ModelApiResponse; -import io.swagger.model.Pet; -import org.junit.Test; -import org.junit.Before; -import static org.junit.Assert.*; - -import javax.ws.rs.core.Response; -import org.apache.cxf.jaxrs.client.JAXRSClientFactory; -import org.apache.cxf.jaxrs.client.ClientConfiguration; -import org.apache.cxf.jaxrs.client.WebClient; - - -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - - - -/** - * API tests for PetApi - */ -public class PetApiTest { - - - private PetApi api; - - @Before - public void setup() { - JacksonJsonProvider provider = new JacksonJsonProvider(); - List providers = new ArrayList(); - providers.add(provider); - - api = JAXRSClientFactory.create("http://petstore.swagger.io/v2", PetApi.class, providers); - org.apache.cxf.jaxrs.client.Client client = WebClient.client(api); - - ClientConfiguration config = WebClient.getConfig(client); - } - - - /** - * Add a new pet to the store - * - * - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void addPetTest() { - Pet body = null; - //api.addPet(body); - - // TODO: test validations - - - } - - /** - * Deletes a pet - * - * - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void deletePetTest() { - Long petId = null; - String apiKey = null; - //api.deletePet(petId, apiKey); - - // TODO: test validations - - - } - - /** - * Finds Pets by status - * - * Multiple status values can be provided with comma separated strings - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void findPetsByStatusTest() { - List status = null; - //List> response = api.findPetsByStatus(status); - //assertNotNull(response); - // TODO: test validations - - - } - - /** - * Finds Pets by tags - * - * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void findPetsByTagsTest() { - List tags = null; - //List> response = api.findPetsByTags(tags); - //assertNotNull(response); - // TODO: test validations - - - } - - /** - * Find pet by ID - * - * Returns a single pet - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void getPetByIdTest() { - Long petId = null; - //Pet response = api.getPetById(petId); - //assertNotNull(response); - // TODO: test validations - - - } - - /** - * Update an existing pet - * - * - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void updatePetTest() { - Pet body = null; - //api.updatePet(body); - - // TODO: test validations - - - } - - /** - * Updates a pet in the store with form data - * - * - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void updatePetWithFormTest() { - Long petId = null; - String name = null; - String status = null; - //api.updatePetWithForm(petId, name, status); - - // TODO: test validations - - - } - - /** - * uploads an image - * - * - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void uploadFileTest() { - Long petId = null; - String additionalMetadata = null; - org.apache.cxf.jaxrs.ext.multipart.Attachment file = null; - //ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file); - //assertNotNull(response); - // TODO: test validations - - - } - -} diff --git a/samples/client/petstore/jaxrs-cxf/src/test/java/io/swagger/api/StoreApiTest.java b/samples/client/petstore/jaxrs-cxf/src/test/java/io/swagger/api/StoreApiTest.java deleted file mode 100644 index 3f88aeb8e9d..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/test/java/io/swagger/api/StoreApiTest.java +++ /dev/null @@ -1,141 +0,0 @@ -/** - * 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.api; - -import io.swagger.model.Order; -import org.junit.Test; -import org.junit.Before; -import static org.junit.Assert.*; - -import javax.ws.rs.core.Response; -import org.apache.cxf.jaxrs.client.JAXRSClientFactory; -import org.apache.cxf.jaxrs.client.ClientConfiguration; -import org.apache.cxf.jaxrs.client.WebClient; - - -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - - - -/** - * API tests for StoreApi - */ -public class StoreApiTest { - - - private StoreApi api; - - @Before - public void setup() { - JacksonJsonProvider provider = new JacksonJsonProvider(); - List providers = new ArrayList(); - providers.add(provider); - - api = JAXRSClientFactory.create("http://petstore.swagger.io/v2", StoreApi.class, providers); - org.apache.cxf.jaxrs.client.Client client = WebClient.client(api); - - ClientConfiguration config = WebClient.getConfig(client); - } - - - /** - * Delete purchase order by ID - * - * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void deleteOrderTest() { - String orderId = null; - //api.deleteOrder(orderId); - - // TODO: test validations - - - } - - /** - * Returns pet inventories by status - * - * Returns a map of status codes to quantities - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void getInventoryTest() { - //Map> response = api.getInventory(); - //assertNotNull(response); - // TODO: test validations - - - } - - /** - * Find purchase order by ID - * - * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void getOrderByIdTest() { - Long orderId = null; - //Order response = api.getOrderById(orderId); - //assertNotNull(response); - // TODO: test validations - - - } - - /** - * Place an order for a pet - * - * - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void placeOrderTest() { - Order body = null; - //Order response = api.placeOrder(body); - //assertNotNull(response); - // TODO: test validations - - - } - -} diff --git a/samples/client/petstore/jaxrs-cxf/src/test/java/io/swagger/api/UserApiTest.java b/samples/client/petstore/jaxrs-cxf/src/test/java/io/swagger/api/UserApiTest.java deleted file mode 100644 index ba69520279d..00000000000 --- a/samples/client/petstore/jaxrs-cxf/src/test/java/io/swagger/api/UserApiTest.java +++ /dev/null @@ -1,215 +0,0 @@ -/** - * 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.api; - -import io.swagger.model.User; -import org.junit.Test; -import org.junit.Before; -import static org.junit.Assert.*; - -import javax.ws.rs.core.Response; -import org.apache.cxf.jaxrs.client.JAXRSClientFactory; -import org.apache.cxf.jaxrs.client.ClientConfiguration; -import org.apache.cxf.jaxrs.client.WebClient; - - -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - - - -/** - * API tests for UserApi - */ -public class UserApiTest { - - - private UserApi api; - - @Before - public void setup() { - JacksonJsonProvider provider = new JacksonJsonProvider(); - List providers = new ArrayList(); - providers.add(provider); - - api = JAXRSClientFactory.create("http://petstore.swagger.io/v2", UserApi.class, providers); - org.apache.cxf.jaxrs.client.Client client = WebClient.client(api); - - ClientConfiguration config = WebClient.getConfig(client); - } - - - /** - * Create user - * - * This can only be done by the logged in user. - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void createUserTest() { - User body = null; - //api.createUser(body); - - // TODO: test validations - - - } - - /** - * Creates list of users with given input array - * - * - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void createUsersWithArrayInputTest() { - List body = null; - //api.createUsersWithArrayInput(body); - - // TODO: test validations - - - } - - /** - * Creates list of users with given input array - * - * - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void createUsersWithListInputTest() { - List body = null; - //api.createUsersWithListInput(body); - - // TODO: test validations - - - } - - /** - * Delete user - * - * This can only be done by the logged in user. - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void deleteUserTest() { - String username = null; - //api.deleteUser(username); - - // TODO: test validations - - - } - - /** - * Get user by user name - * - * - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void getUserByNameTest() { - String username = null; - //User response = api.getUserByName(username); - //assertNotNull(response); - // TODO: test validations - - - } - - /** - * Logs user into the system - * - * - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void loginUserTest() { - String username = null; - String password = null; - //String response = api.loginUser(username, password); - //assertNotNull(response); - // TODO: test validations - - - } - - /** - * Logs out current logged in user session - * - * - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void logoutUserTest() { - //api.logoutUser(); - - // TODO: test validations - - - } - - /** - * Updated user - * - * This can only be done by the logged in user. - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void updateUserTest() { - String username = null; - User body = null; - //api.updateUser(username, body); - - // TODO: test validations - - - } - -}