From 5e1c4cde5093b6f04fd111cfc54203638e24b8de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Bresson?= Date: Mon, 13 Aug 2018 07:26:34 +0200 Subject: [PATCH 1/4] Remove duplicate variable declaration (#792) --- .../languages/PhpLaravelServerCodegen.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java index 0d4f91181de6..ed9215d40101 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java @@ -17,31 +17,13 @@ package org.openapitools.codegen.languages; -import io.swagger.models.properties.*; -import io.swagger.v3.oas.models.*; -import io.swagger.v3.oas.models.media.*; -import io.swagger.v3.oas.models.parameters.*; import org.openapitools.codegen.*; import java.io.File; import java.util.*; -import io.swagger.v3.oas.models.media.*; -import io.swagger.v3.oas.models.PathItem; -import io.swagger.v3.oas.models.PathItem.HttpMethod; -import io.swagger.v3.oas.models.*; -import io.swagger.v3.oas.models.parameters.*; -import io.swagger.v3.core.util.Yaml; - -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - public class PhpLaravelServerCodegen extends AbstractPhpCodegen { - @SuppressWarnings("hiding") protected String apiVersion = "1.0.0"; - protected String variableNamingConvention = "camelCase"; /** * Configures the type of generator. @@ -80,6 +62,7 @@ public PhpLaravelServerCodegen() { super(); embeddedTemplateDir = templateDir = "php-laravel"; + variableNamingConvention = "camelCase"; /* * packPath From c237fe9f1c7c162d9ed870ffb4b8c8cb561b345d Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 13 Aug 2018 13:27:45 +0800 Subject: [PATCH 2/4] Enhancements to documentation generators (samples, default values, etc) (#790) * enhancements to doc generators (samples, default values, etc) * add 3.3.x to PR template --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- bin/dynamic-html.sh | 2 +- bin/html-markdown.sh | 2 +- bin/html-petstore.sh | 2 +- bin/html2-petstore.sh | 2 +- bin/windows/html-petstore.bat | 2 +- bin/windows/html2-petstore.bat | 2 +- .../codegen/languages/ConfluenceWikiCodegen.java | 6 +++--- .../codegen/languages/StaticDocCodegen.java | 8 ++++---- .../codegen/languages/StaticHtml2Generator.java | 6 +++--- .../codegen/languages/StaticHtmlGenerator.java | 6 +++--- .../assets/css/bootstrap-responsive.css | 0 .../assets/css/bootstrap.css | 0 .../assets/css/site.css | 0 .../assets/css/style.css | 0 .../assets/images/logo.png | Bin .../assets/js/bootstrap.js | 0 .../assets/js/jquery-1.8.3.min.js | 0 .../assets/js/main.js | 0 .../index.mustache | 0 .../main.mustache | 0 .../model.mustache | 0 .../operation.mustache | 0 .../package.mustache | 0 .../{swagger-static => openapi-static}/pom.xml | 0 .../documentation/cwiki/.openapi-generator/VERSION | 2 +- .../dynamic-html/.openapi-generator-ignore | 0 .../dynamic-html/.openapi-generator/VERSION | 1 + .../docs/assets/css/bootstrap-responsive.css | 0 .../dynamic-html/docs/assets/css/bootstrap.css | 0 .../dynamic-html/docs/assets/css/style.css | 0 .../dynamic-html/docs/assets/images/logo.png | Bin .../dynamic-html/docs/assets/js/bootstrap.js | 0 .../dynamic-html/docs/assets/js/jquery-1.8.3.min.js | 0 .../dynamic-html/docs/assets/js/main.js | 0 .../dynamic-html/docs/index.html | 0 .../dynamic-html/docs/models/ApiResponse.html | 0 .../dynamic-html/docs/models/Category.html | 0 .../dynamic-html/docs/models/Order.html | 0 .../dynamic-html/docs/models/Pet.html | 0 .../dynamic-html/docs/models/Tag.html | 0 .../dynamic-html/docs/models/User.html | 0 .../dynamic-html/docs/operations/PetApi.html | 0 .../dynamic-html/docs/operations/StoreApi.html | 0 .../dynamic-html/docs/operations/UserApi.html | 0 samples/{ => documentation}/dynamic-html/main.js | 0 .../{ => documentation}/dynamic-html/package.json | 0 .../html.md/.openapi-generator-ignore | 0 .../html.md}/.openapi-generator/VERSION | 0 samples/{ => documentation}/html.md/index.html | 0 .../html/.openapi-generator-ignore | 0 .../documentation/html/.openapi-generator/VERSION | 1 + samples/{ => documentation}/html/index.html | 4 ++-- .../html2/.openapi-generator-ignore | 0 .../documentation/html2/.openapi-generator/VERSION | 1 + samples/{ => documentation}/html2/index.html | 2 +- samples/html.md/.openapi-generator/VERSION | 1 - samples/html/.openapi-generator/VERSION | 1 - samples/html2/.openapi-generator/VERSION | 1 - 59 files changed, 27 insertions(+), 27 deletions(-) rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/assets/css/bootstrap-responsive.css (100%) rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/assets/css/bootstrap.css (100%) rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/assets/css/site.css (100%) rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/assets/css/style.css (100%) rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/assets/images/logo.png (100%) rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/assets/js/bootstrap.js (100%) rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/assets/js/jquery-1.8.3.min.js (100%) rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/assets/js/main.js (100%) rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/index.mustache (100%) rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/main.mustache (100%) rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/model.mustache (100%) rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/operation.mustache (100%) rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/package.mustache (100%) rename modules/openapi-generator/src/main/resources/{swagger-static => openapi-static}/pom.xml (100%) rename samples/{ => documentation}/dynamic-html/.openapi-generator-ignore (100%) create mode 100644 samples/documentation/dynamic-html/.openapi-generator/VERSION rename samples/{ => documentation}/dynamic-html/docs/assets/css/bootstrap-responsive.css (100%) rename samples/{ => documentation}/dynamic-html/docs/assets/css/bootstrap.css (100%) rename samples/{ => documentation}/dynamic-html/docs/assets/css/style.css (100%) rename samples/{ => documentation}/dynamic-html/docs/assets/images/logo.png (100%) rename samples/{ => documentation}/dynamic-html/docs/assets/js/bootstrap.js (100%) rename samples/{ => documentation}/dynamic-html/docs/assets/js/jquery-1.8.3.min.js (100%) rename samples/{ => documentation}/dynamic-html/docs/assets/js/main.js (100%) rename samples/{ => documentation}/dynamic-html/docs/index.html (100%) rename samples/{ => documentation}/dynamic-html/docs/models/ApiResponse.html (100%) rename samples/{ => documentation}/dynamic-html/docs/models/Category.html (100%) rename samples/{ => documentation}/dynamic-html/docs/models/Order.html (100%) rename samples/{ => documentation}/dynamic-html/docs/models/Pet.html (100%) rename samples/{ => documentation}/dynamic-html/docs/models/Tag.html (100%) rename samples/{ => documentation}/dynamic-html/docs/models/User.html (100%) rename samples/{ => documentation}/dynamic-html/docs/operations/PetApi.html (100%) rename samples/{ => documentation}/dynamic-html/docs/operations/StoreApi.html (100%) rename samples/{ => documentation}/dynamic-html/docs/operations/UserApi.html (100%) rename samples/{ => documentation}/dynamic-html/main.js (100%) rename samples/{ => documentation}/dynamic-html/package.json (100%) rename samples/{ => documentation}/html.md/.openapi-generator-ignore (100%) rename samples/{dynamic-html => documentation/html.md}/.openapi-generator/VERSION (100%) rename samples/{ => documentation}/html.md/index.html (100%) rename samples/{ => documentation}/html/.openapi-generator-ignore (100%) create mode 100644 samples/documentation/html/.openapi-generator/VERSION rename samples/{ => documentation}/html/index.html (99%) rename samples/{ => documentation}/html2/.openapi-generator-ignore (100%) create mode 100644 samples/documentation/html2/.openapi-generator/VERSION rename samples/{ => documentation}/html2/index.html (99%) delete mode 100644 samples/html.md/.openapi-generator/VERSION delete mode 100644 samples/html/.openapi-generator/VERSION delete mode 100644 samples/html2/.openapi-generator/VERSION diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f2a2cd59b7e1..e93ef7163643 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,7 +2,7 @@ - [ ] Read the [contribution guidelines](https://github.com/openapitools/openapi-generator/blob/master/CONTRIBUTING.md). - [ ] Ran the shell script under `./bin/` to update Petstore sample so that CIs can verify the change. (For instance, only need to run `./bin/{LANG}-petstore.sh` and `./bin/security/{LANG}-petstore.sh` if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in `.\bin\windows\`. -- [ ] Filed the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`, `4.0.x`. Default: `master`. +- [ ] Filed the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`, `3.3.x`, `4.0.x`. Default: `master`. - [ ] Copied the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) to review the pull request if your PR is targeting a particular programming language. ### Description of the PR diff --git a/bin/dynamic-html.sh b/bin/dynamic-html.sh index 7fc4f6a6ba7a..c98948913433 100755 --- a/bin/dynamic-html.sh +++ b/bin/dynamic-html.sh @@ -27,6 +27,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g dynamic-html -o samples/dynamic-html $@" +ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g dynamic-html -o samples/documentation/dynamic-html $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/html-markdown.sh b/bin/html-markdown.sh index 7808fe8c09df..391e549f2acc 100755 --- a/bin/html-markdown.sh +++ b/bin/html-markdown.sh @@ -27,6 +27,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate -i modules/openapi-generator/src/test/resources/2_0/markdown.yaml -g html -o samples/html.md $@" +ags="generate -i modules/openapi-generator/src/test/resources/2_0/markdown.yaml -g html -o samples/documentation/html.md $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/html-petstore.sh b/bin/html-petstore.sh index 29743d6059aa..1b8fadbac987 100755 --- a/bin/html-petstore.sh +++ b/bin/html-petstore.sh @@ -27,6 +27,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g html -o samples/html $@" +ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g html -o samples/documentation/html $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/html2-petstore.sh b/bin/html2-petstore.sh index 5939463d6c1d..70f6b71c0e5d 100755 --- a/bin/html2-petstore.sh +++ b/bin/html2-petstore.sh @@ -27,6 +27,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g html2 -o samples/html2 --additional-properties hideGenerationTimestamp=true $@" +ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g html2 -o samples/documentation/html2 --additional-properties hideGenerationTimestamp=true $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/windows/html-petstore.bat b/bin/windows/html-petstore.bat index 178890387eff..5a4802d2963a 100755 --- a/bin/windows/html-petstore.bat +++ b/bin/windows/html-petstore.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g html -o samples\client\petstore\html +set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g html -o samples\documentation\html java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/html2-petstore.bat b/bin/windows/html2-petstore.bat index 01330cdceea7..a6386d2efae2 100644 --- a/bin/windows/html2-petstore.bat +++ b/bin/windows/html2-petstore.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g html2 -o samples\html2 +set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g html2 -o samples\documentation\html2 java %JAVA_OPTS% -jar %executable% %ags% diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java index 965d7b70207c..b9243aaa2600 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java @@ -60,9 +60,9 @@ public ConfluenceWikiCodegen() { cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, CodegenConstants.ARTIFACT_VERSION_DESC)); additionalProperties.put("appName", "OpenAPI Sample"); - additionalProperties.put("appDescription", "A sample openapi server"); - additionalProperties.put("infoUrl", "https://helloreverb.com"); - additionalProperties.put("infoEmail", "hello@helloreverb.com"); + additionalProperties.put("appDescription", "A sample OpenAPI server"); + additionalProperties.put("infoUrl", "https://openapi-generator.tech"); + additionalProperties.put("infoEmail", "team@openapitools.org"); additionalProperties.put("licenseInfo", "All rights reserved"); additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html"); additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticDocCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticDocCodegen.java index 5067f039a9ab..56ff29d0f8e2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticDocCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticDocCodegen.java @@ -43,7 +43,7 @@ public StaticDocCodegen() { outputFolder = "docs"; modelTemplateFiles.put("model.mustache", ".html"); apiTemplateFiles.put("operation.mustache", ".html"); - embeddedTemplateDir = templateDir = "swagger-static"; + embeddedTemplateDir = templateDir = "openapi-static"; cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, CodegenConstants.INVOKER_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.GROUP_ID, CodegenConstants.GROUP_ID_DESC)); @@ -94,8 +94,8 @@ public String getHelp() { } @Override - public String escapeReservedWord(String name) { - if(this.reservedWordsMappings().containsKey(name)) { + public String escapeReservedWord(String name) { + if (this.reservedWordsMappings().containsKey(name)) { return this.reservedWordsMappings().get(name); } return "_" + name; @@ -121,5 +121,5 @@ public String escapeQuotationMark(String input) { public String escapeUnsafeCharacters(String input) { // just return the original string return input; - } + } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java index 37fda7e0b9b2..32e198a16529 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java @@ -82,9 +82,9 @@ public StaticHtml2Generator() { cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, CodegenConstants.ARTIFACT_VERSION_DESC)); additionalProperties.put("appName", "OpenAPI Sample"); - additionalProperties.put("appDescription", "A sample openapi server"); + additionalProperties.put("appDescription", "A sample OpenAPI server"); additionalProperties.put("infoUrl", "https://openapi-generator.tech"); - additionalProperties.put("infoEmail", "contributors@openapitools.org"); + additionalProperties.put("infoEmail", "team@openapitools.org"); additionalProperties.put("licenseInfo", "All rights reserved"); additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html"); additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage); @@ -180,7 +180,7 @@ public void preprocessOpenAPI(OpenAPI openAPI) { Map vendorExtensions = openAPI.getExtensions(); if (vendorExtensions != null) { - for(Map.Entry vendorExtension: vendorExtensions.entrySet()) { + for (Map.Entry vendorExtension : vendorExtensions.entrySet()) { // Vendor extensions could be Maps (objects). If we wanted to iterate through them in our template files // without knowing the keys beforehand, the default `toString` method renders them unusable. Instead, we // convert them to JSON strings now, which means we can easily use them later. diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java index eb37f69b4538..feaac9dbc5db 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java @@ -69,9 +69,9 @@ public StaticHtmlGenerator() { cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, CodegenConstants.ARTIFACT_VERSION_DESC)); additionalProperties.put("appName", "OpenAPI Sample"); - additionalProperties.put("appDescription", "A sample openapi server"); - additionalProperties.put("infoUrl", "https://helloreverb.com"); - additionalProperties.put("infoEmail", "hello@helloreverb.com"); + additionalProperties.put("appDescription", "A sample OpenAPI server"); + additionalProperties.put("infoUrl", "https//openapi-generator.tech"); + additionalProperties.put("infoEmail", "team@openapitools.org"); additionalProperties.put("licenseInfo", "All rights reserved"); additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html"); additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage); diff --git a/modules/openapi-generator/src/main/resources/swagger-static/assets/css/bootstrap-responsive.css b/modules/openapi-generator/src/main/resources/openapi-static/assets/css/bootstrap-responsive.css similarity index 100% rename from modules/openapi-generator/src/main/resources/swagger-static/assets/css/bootstrap-responsive.css rename to modules/openapi-generator/src/main/resources/openapi-static/assets/css/bootstrap-responsive.css diff --git a/modules/openapi-generator/src/main/resources/swagger-static/assets/css/bootstrap.css b/modules/openapi-generator/src/main/resources/openapi-static/assets/css/bootstrap.css similarity index 100% rename from modules/openapi-generator/src/main/resources/swagger-static/assets/css/bootstrap.css rename to modules/openapi-generator/src/main/resources/openapi-static/assets/css/bootstrap.css diff --git a/modules/openapi-generator/src/main/resources/swagger-static/assets/css/site.css b/modules/openapi-generator/src/main/resources/openapi-static/assets/css/site.css similarity index 100% rename from modules/openapi-generator/src/main/resources/swagger-static/assets/css/site.css rename to modules/openapi-generator/src/main/resources/openapi-static/assets/css/site.css diff --git a/modules/openapi-generator/src/main/resources/swagger-static/assets/css/style.css b/modules/openapi-generator/src/main/resources/openapi-static/assets/css/style.css similarity index 100% rename from modules/openapi-generator/src/main/resources/swagger-static/assets/css/style.css rename to modules/openapi-generator/src/main/resources/openapi-static/assets/css/style.css diff --git a/modules/openapi-generator/src/main/resources/swagger-static/assets/images/logo.png b/modules/openapi-generator/src/main/resources/openapi-static/assets/images/logo.png similarity index 100% rename from modules/openapi-generator/src/main/resources/swagger-static/assets/images/logo.png rename to modules/openapi-generator/src/main/resources/openapi-static/assets/images/logo.png diff --git a/modules/openapi-generator/src/main/resources/swagger-static/assets/js/bootstrap.js b/modules/openapi-generator/src/main/resources/openapi-static/assets/js/bootstrap.js similarity index 100% rename from modules/openapi-generator/src/main/resources/swagger-static/assets/js/bootstrap.js rename to modules/openapi-generator/src/main/resources/openapi-static/assets/js/bootstrap.js diff --git a/modules/openapi-generator/src/main/resources/swagger-static/assets/js/jquery-1.8.3.min.js b/modules/openapi-generator/src/main/resources/openapi-static/assets/js/jquery-1.8.3.min.js similarity index 100% rename from modules/openapi-generator/src/main/resources/swagger-static/assets/js/jquery-1.8.3.min.js rename to modules/openapi-generator/src/main/resources/openapi-static/assets/js/jquery-1.8.3.min.js diff --git a/modules/openapi-generator/src/main/resources/swagger-static/assets/js/main.js b/modules/openapi-generator/src/main/resources/openapi-static/assets/js/main.js similarity index 100% rename from modules/openapi-generator/src/main/resources/swagger-static/assets/js/main.js rename to modules/openapi-generator/src/main/resources/openapi-static/assets/js/main.js diff --git a/modules/openapi-generator/src/main/resources/swagger-static/index.mustache b/modules/openapi-generator/src/main/resources/openapi-static/index.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/swagger-static/index.mustache rename to modules/openapi-generator/src/main/resources/openapi-static/index.mustache diff --git a/modules/openapi-generator/src/main/resources/swagger-static/main.mustache b/modules/openapi-generator/src/main/resources/openapi-static/main.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/swagger-static/main.mustache rename to modules/openapi-generator/src/main/resources/openapi-static/main.mustache diff --git a/modules/openapi-generator/src/main/resources/swagger-static/model.mustache b/modules/openapi-generator/src/main/resources/openapi-static/model.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/swagger-static/model.mustache rename to modules/openapi-generator/src/main/resources/openapi-static/model.mustache diff --git a/modules/openapi-generator/src/main/resources/swagger-static/operation.mustache b/modules/openapi-generator/src/main/resources/openapi-static/operation.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/swagger-static/operation.mustache rename to modules/openapi-generator/src/main/resources/openapi-static/operation.mustache diff --git a/modules/openapi-generator/src/main/resources/swagger-static/package.mustache b/modules/openapi-generator/src/main/resources/openapi-static/package.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/swagger-static/package.mustache rename to modules/openapi-generator/src/main/resources/openapi-static/package.mustache diff --git a/modules/openapi-generator/src/main/resources/swagger-static/pom.xml b/modules/openapi-generator/src/main/resources/openapi-static/pom.xml similarity index 100% rename from modules/openapi-generator/src/main/resources/swagger-static/pom.xml rename to modules/openapi-generator/src/main/resources/openapi-static/pom.xml diff --git a/samples/documentation/cwiki/.openapi-generator/VERSION b/samples/documentation/cwiki/.openapi-generator/VERSION index 096bf47efe31..14900cee60e8 100644 --- a/samples/documentation/cwiki/.openapi-generator/VERSION +++ b/samples/documentation/cwiki/.openapi-generator/VERSION @@ -1 +1 @@ -3.0.0-SNAPSHOT \ No newline at end of file +3.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/dynamic-html/.openapi-generator-ignore b/samples/documentation/dynamic-html/.openapi-generator-ignore similarity index 100% rename from samples/dynamic-html/.openapi-generator-ignore rename to samples/documentation/dynamic-html/.openapi-generator-ignore diff --git a/samples/documentation/dynamic-html/.openapi-generator/VERSION b/samples/documentation/dynamic-html/.openapi-generator/VERSION new file mode 100644 index 000000000000..14900cee60e8 --- /dev/null +++ b/samples/documentation/dynamic-html/.openapi-generator/VERSION @@ -0,0 +1 @@ +3.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/dynamic-html/docs/assets/css/bootstrap-responsive.css b/samples/documentation/dynamic-html/docs/assets/css/bootstrap-responsive.css similarity index 100% rename from samples/dynamic-html/docs/assets/css/bootstrap-responsive.css rename to samples/documentation/dynamic-html/docs/assets/css/bootstrap-responsive.css diff --git a/samples/dynamic-html/docs/assets/css/bootstrap.css b/samples/documentation/dynamic-html/docs/assets/css/bootstrap.css similarity index 100% rename from samples/dynamic-html/docs/assets/css/bootstrap.css rename to samples/documentation/dynamic-html/docs/assets/css/bootstrap.css diff --git a/samples/dynamic-html/docs/assets/css/style.css b/samples/documentation/dynamic-html/docs/assets/css/style.css similarity index 100% rename from samples/dynamic-html/docs/assets/css/style.css rename to samples/documentation/dynamic-html/docs/assets/css/style.css diff --git a/samples/dynamic-html/docs/assets/images/logo.png b/samples/documentation/dynamic-html/docs/assets/images/logo.png similarity index 100% rename from samples/dynamic-html/docs/assets/images/logo.png rename to samples/documentation/dynamic-html/docs/assets/images/logo.png diff --git a/samples/dynamic-html/docs/assets/js/bootstrap.js b/samples/documentation/dynamic-html/docs/assets/js/bootstrap.js similarity index 100% rename from samples/dynamic-html/docs/assets/js/bootstrap.js rename to samples/documentation/dynamic-html/docs/assets/js/bootstrap.js diff --git a/samples/dynamic-html/docs/assets/js/jquery-1.8.3.min.js b/samples/documentation/dynamic-html/docs/assets/js/jquery-1.8.3.min.js similarity index 100% rename from samples/dynamic-html/docs/assets/js/jquery-1.8.3.min.js rename to samples/documentation/dynamic-html/docs/assets/js/jquery-1.8.3.min.js diff --git a/samples/dynamic-html/docs/assets/js/main.js b/samples/documentation/dynamic-html/docs/assets/js/main.js similarity index 100% rename from samples/dynamic-html/docs/assets/js/main.js rename to samples/documentation/dynamic-html/docs/assets/js/main.js diff --git a/samples/dynamic-html/docs/index.html b/samples/documentation/dynamic-html/docs/index.html similarity index 100% rename from samples/dynamic-html/docs/index.html rename to samples/documentation/dynamic-html/docs/index.html diff --git a/samples/dynamic-html/docs/models/ApiResponse.html b/samples/documentation/dynamic-html/docs/models/ApiResponse.html similarity index 100% rename from samples/dynamic-html/docs/models/ApiResponse.html rename to samples/documentation/dynamic-html/docs/models/ApiResponse.html diff --git a/samples/dynamic-html/docs/models/Category.html b/samples/documentation/dynamic-html/docs/models/Category.html similarity index 100% rename from samples/dynamic-html/docs/models/Category.html rename to samples/documentation/dynamic-html/docs/models/Category.html diff --git a/samples/dynamic-html/docs/models/Order.html b/samples/documentation/dynamic-html/docs/models/Order.html similarity index 100% rename from samples/dynamic-html/docs/models/Order.html rename to samples/documentation/dynamic-html/docs/models/Order.html diff --git a/samples/dynamic-html/docs/models/Pet.html b/samples/documentation/dynamic-html/docs/models/Pet.html similarity index 100% rename from samples/dynamic-html/docs/models/Pet.html rename to samples/documentation/dynamic-html/docs/models/Pet.html diff --git a/samples/dynamic-html/docs/models/Tag.html b/samples/documentation/dynamic-html/docs/models/Tag.html similarity index 100% rename from samples/dynamic-html/docs/models/Tag.html rename to samples/documentation/dynamic-html/docs/models/Tag.html diff --git a/samples/dynamic-html/docs/models/User.html b/samples/documentation/dynamic-html/docs/models/User.html similarity index 100% rename from samples/dynamic-html/docs/models/User.html rename to samples/documentation/dynamic-html/docs/models/User.html diff --git a/samples/dynamic-html/docs/operations/PetApi.html b/samples/documentation/dynamic-html/docs/operations/PetApi.html similarity index 100% rename from samples/dynamic-html/docs/operations/PetApi.html rename to samples/documentation/dynamic-html/docs/operations/PetApi.html diff --git a/samples/dynamic-html/docs/operations/StoreApi.html b/samples/documentation/dynamic-html/docs/operations/StoreApi.html similarity index 100% rename from samples/dynamic-html/docs/operations/StoreApi.html rename to samples/documentation/dynamic-html/docs/operations/StoreApi.html diff --git a/samples/dynamic-html/docs/operations/UserApi.html b/samples/documentation/dynamic-html/docs/operations/UserApi.html similarity index 100% rename from samples/dynamic-html/docs/operations/UserApi.html rename to samples/documentation/dynamic-html/docs/operations/UserApi.html diff --git a/samples/dynamic-html/main.js b/samples/documentation/dynamic-html/main.js similarity index 100% rename from samples/dynamic-html/main.js rename to samples/documentation/dynamic-html/main.js diff --git a/samples/dynamic-html/package.json b/samples/documentation/dynamic-html/package.json similarity index 100% rename from samples/dynamic-html/package.json rename to samples/documentation/dynamic-html/package.json diff --git a/samples/html.md/.openapi-generator-ignore b/samples/documentation/html.md/.openapi-generator-ignore similarity index 100% rename from samples/html.md/.openapi-generator-ignore rename to samples/documentation/html.md/.openapi-generator-ignore diff --git a/samples/dynamic-html/.openapi-generator/VERSION b/samples/documentation/html.md/.openapi-generator/VERSION similarity index 100% rename from samples/dynamic-html/.openapi-generator/VERSION rename to samples/documentation/html.md/.openapi-generator/VERSION diff --git a/samples/html.md/index.html b/samples/documentation/html.md/index.html similarity index 100% rename from samples/html.md/index.html rename to samples/documentation/html.md/index.html diff --git a/samples/html/.openapi-generator-ignore b/samples/documentation/html/.openapi-generator-ignore similarity index 100% rename from samples/html/.openapi-generator-ignore rename to samples/documentation/html/.openapi-generator-ignore diff --git a/samples/documentation/html/.openapi-generator/VERSION b/samples/documentation/html/.openapi-generator/VERSION new file mode 100644 index 000000000000..14900cee60e8 --- /dev/null +++ b/samples/documentation/html/.openapi-generator/VERSION @@ -0,0 +1 @@ +3.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/html/index.html b/samples/documentation/html/index.html similarity index 99% rename from samples/html/index.html rename to samples/documentation/html/index.html index 0d30f2be00bd..f2a1bfb3f77d 100644 --- a/samples/html/index.html +++ b/samples/documentation/html/index.html @@ -181,8 +181,8 @@

OpenAPI Petstore

This is a sample server Petstore server. For this sample, you can use the api key special-key to test the authorization filters.
-
More information: https://helloreverb.com
-
Contact Info: hello@helloreverb.com
+ +
Contact Info: team@openapitools.org
Version: 1.0.0
BasePath:/v2
Apache-2.0
diff --git a/samples/html2/.openapi-generator-ignore b/samples/documentation/html2/.openapi-generator-ignore similarity index 100% rename from samples/html2/.openapi-generator-ignore rename to samples/documentation/html2/.openapi-generator-ignore diff --git a/samples/documentation/html2/.openapi-generator/VERSION b/samples/documentation/html2/.openapi-generator/VERSION new file mode 100644 index 000000000000..14900cee60e8 --- /dev/null +++ b/samples/documentation/html2/.openapi-generator/VERSION @@ -0,0 +1 @@ +3.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/html2/index.html b/samples/documentation/html2/index.html similarity index 99% rename from samples/html2/index.html rename to samples/documentation/html2/index.html index 821520080add..5b9ce2fe173c 100644 --- a/samples/html2/index.html +++ b/samples/documentation/html2/index.html @@ -8103,7 +8103,7 @@