diff --git a/.github/workflows/samples-java-client-echo-api-jdk11.yaml b/.github/workflows/samples-java-client-echo-api-jdk11.yaml index 37d31b05b11..f1fe59ac1fe 100644 --- a/.github/workflows/samples-java-client-echo-api-jdk11.yaml +++ b/.github/workflows/samples-java-client-echo-api-jdk11.yaml @@ -20,6 +20,7 @@ jobs: - samples/client/echo_api/java/native - samples/client/echo_api/java/feign-gson - samples/client/echo_api/java/resttemplate + - samples/client/echo_api/java/resteasy steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 diff --git a/.github/workflows/samples-java-client-echo-api-jdk8.yaml b/.github/workflows/samples-java-client-echo-api-jdk8.yaml index be52ff7c417..a8d874db664 100644 --- a/.github/workflows/samples-java-client-echo-api-jdk8.yaml +++ b/.github/workflows/samples-java-client-echo-api-jdk8.yaml @@ -7,12 +7,13 @@ on: - samples/client/echo_api/java/feign-gson/** - samples/client/echo_api/java/okhttp-gson/** - samples/client/echo_api/java/resttemplate/** + - samples/client/echo_api/java/resteasy/** pull_request: paths: - samples/client/echo_api/java/apache-httpclient/** - samples/client/echo_api/java/feign-gson/** - samples/client/echo_api/java/okhttp-gson/** - - samples/client/echo_api/java/resttemplate/** + - samples/client/echo_api/java/resteasy/** jobs: build: name: Build Java Client JDK8 @@ -26,6 +27,7 @@ jobs: - samples/client/echo_api/java/feign-gson - samples/client/echo_api/java/okhttp-gson - samples/client/echo_api/java/resttemplate + - samples/client/echo_api/java/resteasy steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 diff --git a/bin/configs/java-resteasy-echo.yaml b/bin/configs/java-resteasy-echo-api.yaml similarity index 83% rename from bin/configs/java-resteasy-echo.yaml rename to bin/configs/java-resteasy-echo-api.yaml index adca68137b0..c99ffe228d2 100644 --- a/bin/configs/java-resteasy-echo.yaml +++ b/bin/configs/java-resteasy-echo-api.yaml @@ -1,5 +1,5 @@ generatorName: java -outputDir: samples/client/petstore/java/resteasy-echo +outputDir: samples/client/echo_api/java/resteasy inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: diff --git a/samples/client/petstore/java/resteasy-echo/.github/workflows/maven.yml b/samples/client/echo_api/java/resteasy/.github/workflows/maven.yml similarity index 100% rename from samples/client/petstore/java/resteasy-echo/.github/workflows/maven.yml rename to samples/client/echo_api/java/resteasy/.github/workflows/maven.yml diff --git a/samples/client/petstore/java/resteasy-echo/.gitignore b/samples/client/echo_api/java/resteasy/.gitignore similarity index 100% rename from samples/client/petstore/java/resteasy-echo/.gitignore rename to samples/client/echo_api/java/resteasy/.gitignore diff --git a/samples/client/petstore/java/resteasy-echo/.openapi-generator-ignore b/samples/client/echo_api/java/resteasy/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/java/resteasy-echo/.openapi-generator-ignore rename to samples/client/echo_api/java/resteasy/.openapi-generator-ignore diff --git a/samples/client/petstore/java/resteasy-echo/.openapi-generator/FILES b/samples/client/echo_api/java/resteasy/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/java/resteasy-echo/.openapi-generator/FILES rename to samples/client/echo_api/java/resteasy/.openapi-generator/FILES diff --git a/samples/client/petstore/java/resteasy-echo/.openapi-generator/VERSION b/samples/client/echo_api/java/resteasy/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/java/resteasy-echo/.openapi-generator/VERSION rename to samples/client/echo_api/java/resteasy/.openapi-generator/VERSION diff --git a/samples/client/petstore/java/resteasy-echo/.travis.yml b/samples/client/echo_api/java/resteasy/.travis.yml similarity index 100% rename from samples/client/petstore/java/resteasy-echo/.travis.yml rename to samples/client/echo_api/java/resteasy/.travis.yml diff --git a/samples/client/petstore/java/resteasy-echo/README.md b/samples/client/echo_api/java/resteasy/README.md similarity index 100% rename from samples/client/petstore/java/resteasy-echo/README.md rename to samples/client/echo_api/java/resteasy/README.md diff --git a/samples/client/petstore/java/resteasy-echo/api/openapi.yaml b/samples/client/echo_api/java/resteasy/api/openapi.yaml similarity index 100% rename from samples/client/petstore/java/resteasy-echo/api/openapi.yaml rename to samples/client/echo_api/java/resteasy/api/openapi.yaml diff --git a/samples/client/petstore/java/resteasy-echo/build.gradle b/samples/client/echo_api/java/resteasy/build.gradle similarity index 100% rename from samples/client/petstore/java/resteasy-echo/build.gradle rename to samples/client/echo_api/java/resteasy/build.gradle diff --git a/samples/client/petstore/java/resteasy-echo/build.sbt b/samples/client/echo_api/java/resteasy/build.sbt similarity index 100% rename from samples/client/petstore/java/resteasy-echo/build.sbt rename to samples/client/echo_api/java/resteasy/build.sbt diff --git a/samples/client/petstore/java/resteasy-echo/docs/AuthApi.md b/samples/client/echo_api/java/resteasy/docs/AuthApi.md similarity index 100% rename from samples/client/petstore/java/resteasy-echo/docs/AuthApi.md rename to samples/client/echo_api/java/resteasy/docs/AuthApi.md diff --git a/samples/client/petstore/java/resteasy-echo/docs/Bird.md b/samples/client/echo_api/java/resteasy/docs/Bird.md similarity index 100% rename from samples/client/petstore/java/resteasy-echo/docs/Bird.md rename to samples/client/echo_api/java/resteasy/docs/Bird.md diff --git a/samples/client/petstore/java/resteasy-echo/docs/BodyApi.md b/samples/client/echo_api/java/resteasy/docs/BodyApi.md similarity index 100% rename from samples/client/petstore/java/resteasy-echo/docs/BodyApi.md rename to samples/client/echo_api/java/resteasy/docs/BodyApi.md diff --git a/samples/client/petstore/java/resteasy-echo/docs/Category.md b/samples/client/echo_api/java/resteasy/docs/Category.md similarity index 100% rename from samples/client/petstore/java/resteasy-echo/docs/Category.md rename to samples/client/echo_api/java/resteasy/docs/Category.md diff --git a/samples/client/petstore/java/resteasy-echo/docs/DataQuery.md b/samples/client/echo_api/java/resteasy/docs/DataQuery.md similarity index 100% rename from samples/client/petstore/java/resteasy-echo/docs/DataQuery.md rename to samples/client/echo_api/java/resteasy/docs/DataQuery.md diff --git a/samples/client/petstore/java/resteasy-echo/docs/DefaultValue.md b/samples/client/echo_api/java/resteasy/docs/DefaultValue.md similarity index 100% rename from samples/client/petstore/java/resteasy-echo/docs/DefaultValue.md rename to samples/client/echo_api/java/resteasy/docs/DefaultValue.md diff --git a/samples/client/petstore/java/resteasy-echo/docs/FormApi.md b/samples/client/echo_api/java/resteasy/docs/FormApi.md similarity index 100% rename from samples/client/petstore/java/resteasy-echo/docs/FormApi.md rename to samples/client/echo_api/java/resteasy/docs/FormApi.md diff --git a/samples/client/petstore/java/resteasy-echo/docs/HeaderApi.md b/samples/client/echo_api/java/resteasy/docs/HeaderApi.md similarity index 100% rename from samples/client/petstore/java/resteasy-echo/docs/HeaderApi.md rename to samples/client/echo_api/java/resteasy/docs/HeaderApi.md diff --git a/samples/client/petstore/java/resteasy-echo/docs/NumberPropertiesOnly.md b/samples/client/echo_api/java/resteasy/docs/NumberPropertiesOnly.md similarity index 100% rename from samples/client/petstore/java/resteasy-echo/docs/NumberPropertiesOnly.md rename to samples/client/echo_api/java/resteasy/docs/NumberPropertiesOnly.md diff --git a/samples/client/petstore/java/resteasy-echo/docs/PathApi.md b/samples/client/echo_api/java/resteasy/docs/PathApi.md similarity index 100% rename from samples/client/petstore/java/resteasy-echo/docs/PathApi.md rename to samples/client/echo_api/java/resteasy/docs/PathApi.md diff --git a/samples/client/petstore/java/resteasy-echo/docs/Pet.md b/samples/client/echo_api/java/resteasy/docs/Pet.md similarity index 100% rename from samples/client/petstore/java/resteasy-echo/docs/Pet.md rename to samples/client/echo_api/java/resteasy/docs/Pet.md diff --git a/samples/client/petstore/java/resteasy-echo/docs/Query.md b/samples/client/echo_api/java/resteasy/docs/Query.md similarity index 100% rename from samples/client/petstore/java/resteasy-echo/docs/Query.md rename to samples/client/echo_api/java/resteasy/docs/Query.md diff --git a/samples/client/petstore/java/resteasy-echo/docs/QueryApi.md b/samples/client/echo_api/java/resteasy/docs/QueryApi.md similarity index 100% rename from samples/client/petstore/java/resteasy-echo/docs/QueryApi.md rename to samples/client/echo_api/java/resteasy/docs/QueryApi.md diff --git a/samples/client/petstore/java/resteasy-echo/docs/StringEnumRef.md b/samples/client/echo_api/java/resteasy/docs/StringEnumRef.md similarity index 100% rename from samples/client/petstore/java/resteasy-echo/docs/StringEnumRef.md rename to samples/client/echo_api/java/resteasy/docs/StringEnumRef.md diff --git a/samples/client/petstore/java/resteasy-echo/docs/Tag.md b/samples/client/echo_api/java/resteasy/docs/Tag.md similarity index 100% rename from samples/client/petstore/java/resteasy-echo/docs/Tag.md rename to samples/client/echo_api/java/resteasy/docs/Tag.md diff --git a/samples/client/petstore/java/resteasy-echo/docs/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.md b/samples/client/echo_api/java/resteasy/docs/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.md similarity index 100% rename from samples/client/petstore/java/resteasy-echo/docs/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.md rename to samples/client/echo_api/java/resteasy/docs/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.md diff --git a/samples/client/petstore/java/resteasy-echo/docs/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.md b/samples/client/echo_api/java/resteasy/docs/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.md similarity index 100% rename from samples/client/petstore/java/resteasy-echo/docs/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.md rename to samples/client/echo_api/java/resteasy/docs/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.md diff --git a/samples/client/petstore/java/resteasy-echo/git_push.sh b/samples/client/echo_api/java/resteasy/git_push.sh similarity index 100% rename from samples/client/petstore/java/resteasy-echo/git_push.sh rename to samples/client/echo_api/java/resteasy/git_push.sh diff --git a/samples/client/petstore/java/resteasy-echo/gradle.properties b/samples/client/echo_api/java/resteasy/gradle.properties similarity index 100% rename from samples/client/petstore/java/resteasy-echo/gradle.properties rename to samples/client/echo_api/java/resteasy/gradle.properties diff --git a/samples/client/petstore/java/resteasy-echo/gradle/wrapper/gradle-wrapper.jar b/samples/client/echo_api/java/resteasy/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from samples/client/petstore/java/resteasy-echo/gradle/wrapper/gradle-wrapper.jar rename to samples/client/echo_api/java/resteasy/gradle/wrapper/gradle-wrapper.jar diff --git a/samples/client/petstore/java/resteasy-echo/gradle/wrapper/gradle-wrapper.properties b/samples/client/echo_api/java/resteasy/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from samples/client/petstore/java/resteasy-echo/gradle/wrapper/gradle-wrapper.properties rename to samples/client/echo_api/java/resteasy/gradle/wrapper/gradle-wrapper.properties diff --git a/samples/client/petstore/java/resteasy-echo/gradlew b/samples/client/echo_api/java/resteasy/gradlew similarity index 100% rename from samples/client/petstore/java/resteasy-echo/gradlew rename to samples/client/echo_api/java/resteasy/gradlew diff --git a/samples/client/petstore/java/resteasy-echo/gradlew.bat b/samples/client/echo_api/java/resteasy/gradlew.bat similarity index 100% rename from samples/client/petstore/java/resteasy-echo/gradlew.bat rename to samples/client/echo_api/java/resteasy/gradlew.bat diff --git a/samples/client/petstore/java/resteasy-echo/pom.xml b/samples/client/echo_api/java/resteasy/pom.xml similarity index 100% rename from samples/client/petstore/java/resteasy-echo/pom.xml rename to samples/client/echo_api/java/resteasy/pom.xml diff --git a/samples/client/petstore/java/resteasy-echo/settings.gradle b/samples/client/echo_api/java/resteasy/settings.gradle similarity index 100% rename from samples/client/petstore/java/resteasy-echo/settings.gradle rename to samples/client/echo_api/java/resteasy/settings.gradle diff --git a/samples/client/petstore/java/resteasy-echo/src/main/AndroidManifest.xml b/samples/client/echo_api/java/resteasy/src/main/AndroidManifest.xml similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/AndroidManifest.xml rename to samples/client/echo_api/java/resteasy/src/main/AndroidManifest.xml diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/ApiClient.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/ApiClient.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/ApiClient.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/ApiException.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/ApiException.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/ApiException.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/ApiException.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/Configuration.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/Configuration.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/Configuration.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/Configuration.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/JSON.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/JSON.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/JSON.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/JSON.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/JavaTimeFormatter.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/JavaTimeFormatter.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/JavaTimeFormatter.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/JavaTimeFormatter.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/Pair.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/Pair.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/Pair.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/Pair.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/RFC3339DateFormat.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/RFC3339DateFormat.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/RFC3339DateFormat.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/RFC3339DateFormat.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/ServerConfiguration.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/ServerConfiguration.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/ServerConfiguration.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/ServerConfiguration.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/ServerVariable.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/ServerVariable.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/ServerVariable.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/ServerVariable.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/StringUtil.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/StringUtil.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/StringUtil.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/api/AuthApi.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/api/AuthApi.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/api/AuthApi.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/api/AuthApi.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/api/BodyApi.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/api/BodyApi.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/api/BodyApi.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/api/BodyApi.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/api/FormApi.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/api/FormApi.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/api/FormApi.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/api/FormApi.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/api/HeaderApi.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/api/HeaderApi.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/api/HeaderApi.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/api/HeaderApi.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/api/PathApi.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/api/PathApi.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/api/PathApi.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/api/PathApi.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/api/QueryApi.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/api/QueryApi.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/api/QueryApi.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/api/QueryApi.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/auth/Authentication.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/auth/Authentication.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/auth/Authentication.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/auth/Authentication.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/Bird.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Bird.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/Bird.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Bird.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/Category.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Category.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/Category.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Category.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/DataQuery.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/DataQuery.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/DataQuery.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/DefaultValue.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/DefaultValue.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/DefaultValue.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/Pet.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/Query.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Query.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/Query.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Query.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/StringEnumRef.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/StringEnumRef.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/StringEnumRef.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/StringEnumRef.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/Tag.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java diff --git a/samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java rename to samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/CustomTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/CustomTest.java new file mode 100644 index 00000000000..1ffbe4ace09 --- /dev/null +++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/CustomTest.java @@ -0,0 +1,73 @@ +/* + * Echo Server API + * Echo Server API + * + * The version of the OpenAPI document: 0.1.0 + * Contact: team@openapitools.org + * + * 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 java.io.File; +import org.openapitools.client.model.Pet; +import org.openapitools.client.model.Tag; +import org.junit.Test; +import org.junit.Ignore; +import org.junit.Assert; + +import java.io.FileWriter; +import java.io.IOException; +import java.time.LocalDate; +import java.time.OffsetDateTime; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertTrue; + +/** + * API tests + */ +public class CustomTest { + + private final BodyApi api = new BodyApi(); + + /** + * Test single binary in multipart mime + * + * @see + * #17367 + */ + @Test + public void testBodyMultipartFormdataSingleBinaryTest() throws ApiException, IOException { + File myFile = new File("test.txt"); + if (!myFile.exists()){ + assertTrue(myFile.createNewFile()); + } + FileWriter fw = new FileWriter(myFile); + fw.write("testing only"); + fw.close(); + myFile.deleteOnExit(); + + String response = + api.testBodyMultipartFormdataSingleBinary(myFile); + + EchoServerResponseParser parser = + new EchoServerResponseParser(response); + + String contentDisposition = parser.headers.get("Content-Disposition"); + + assertThat(contentDisposition, containsString( + "form-data; name=\"my-file\"; filename=\"test.txt\"" + )); + } +} diff --git a/samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/api/EchoServerResponseParser.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/EchoServerResponseParser.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/api/EchoServerResponseParser.java rename to samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/EchoServerResponseParser.java diff --git a/samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/api/AuthApiTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/AuthApiTest.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/api/AuthApiTest.java rename to samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/AuthApiTest.java diff --git a/samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/api/BodyApiTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/BodyApiTest.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/api/BodyApiTest.java rename to samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/BodyApiTest.java diff --git a/samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/api/FormApiTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/FormApiTest.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/api/FormApiTest.java rename to samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/FormApiTest.java diff --git a/samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/api/HeaderApiTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/HeaderApiTest.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/api/HeaderApiTest.java rename to samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/HeaderApiTest.java diff --git a/samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/api/PathApiTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/PathApiTest.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/api/PathApiTest.java rename to samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/PathApiTest.java diff --git a/samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/api/QueryApiTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/QueryApiTest.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/api/QueryApiTest.java rename to samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/QueryApiTest.java diff --git a/samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/BirdTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/BirdTest.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/BirdTest.java rename to samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/BirdTest.java diff --git a/samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/CategoryTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/CategoryTest.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/CategoryTest.java rename to samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/CategoryTest.java diff --git a/samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/DataQueryTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/DataQueryTest.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/DataQueryTest.java rename to samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/DataQueryTest.java diff --git a/samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/DefaultValueTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/DefaultValueTest.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/DefaultValueTest.java rename to samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/DefaultValueTest.java diff --git a/samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java rename to samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java diff --git a/samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/PetTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/PetTest.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/PetTest.java rename to samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/PetTest.java diff --git a/samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/QueryTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/QueryTest.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/QueryTest.java rename to samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/QueryTest.java diff --git a/samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/StringEnumRefTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/StringEnumRefTest.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/StringEnumRefTest.java rename to samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/StringEnumRefTest.java diff --git a/samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/TagTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TagTest.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/TagTest.java rename to samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TagTest.java diff --git a/samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.java rename to samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.java diff --git a/samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest.java similarity index 100% rename from samples/client/petstore/java/resteasy-echo/src/test/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest.java rename to samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest.java