diff --git a/bin/utils/ensure-up-to-date b/bin/utils/ensure-up-to-date index 69f52f0fed0f..f8f84d393ef0 100755 --- a/bin/utils/ensure-up-to-date +++ b/bin/utils/ensure-up-to-date @@ -1,6 +1,6 @@ #!/bin/bash # this bash script run the scripts for the 'mature' generators -# it ensures that all changes are commited into the 'samples/' folder +# it ensures that all changes are committed into the 'samples/' folder echo "# START SCRIPT: $0" diff --git a/docs/3.0.0-release-note.md b/docs/3.0.0-release-note.md index 1bb85e97de06..12a20c149e56 100644 --- a/docs/3.0.0-release-note.md +++ b/docs/3.0.0-release-note.md @@ -166,7 +166,7 @@ cf8d8d56f [PHP] Fix code example from README. Variable name was missing when usi 76907cacd [PHP] declare property headerSelector ### Python -7184f1ec6 [python] asyncio supports _preload_content; remove unsed imports (#107) +7184f1ec6 [python] asyncio supports _preload_content; remove unused imports (#107) d74d2ba03 fix: python clients 8e0a0ebd6 Fix python / tornado body handling b39c35c76 Fix inconsistency between model name and file name in python client @@ -250,7 +250,7 @@ ce930e7a6 [Jaxrs-cxf] Add bean-level cascaded beanvalidation for pojos (@Valid) ff1178ad7 [Java][Spring] fix missing optional query params 2103fadab Fix package declaration for play-framework 2c6380c84 fix inner item (list, map) for play framework -e33b350c8 Fix an issue in Play Framework generator where a CSV is empty and transfered to the controllerImp with an empty item. +e33b350c8 Fix an issue in Play Framework generator where a CSV is empty and transferred to the controllerImp with an empty item. 99fc27246 [JAX-RS][Spec] Removes throws Exception. fe2a44339 Fixes issue (SpringCodeGen dateLibrary "java8-localdatetime" option is ignored). d890d733f [JaxRS][Java] issue with implFolder on windows, and required fields generation for containers (#88) diff --git a/modules/openapi-generator-online/README.md b/modules/openapi-generator-online/README.md index a12a59c79ed0..b6dde7e276c6 100644 --- a/modules/openapi-generator-online/README.md +++ b/modules/openapi-generator-online/README.md @@ -10,6 +10,6 @@ This is an example of building a OpenAPI-enabled server in Java using the Spring The underlying library integrating OpenAPI to SpringBoot is [springfox](https://github.com/springfox/springfox) -Start your server as an simple java application +Start your server as a simple java application -Change default port value in application.properties \ No newline at end of file +Change default port value in application.properties diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 5901ea677601..7c37731bc63e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -210,7 +210,7 @@ public Map postProcessAllModels(Map objs) { for (String name : allModels.keySet()) { CodegenModel cm = allModels.get(name); CodegenModel parent = allModels.get(cm.getParent()); - // if a discriminator exists on the parent, don't add this child to the inheritance heirarchy + // if a discriminator exists on the parent, don't add this child to the inheritance hierarchy // TODO Determine what to do if the parent discriminator name == the grandparent discriminator name while (parent != null) { if (parent.getChildren() == null) { @@ -1201,7 +1201,7 @@ public String getSchemaType(Schema schema) { */ private static String getPrimitiveType(Schema schema) { if (schema == null) { - throw new RuntimeException("schema cannnot be null in getPrimitiveType"); + throw new RuntimeException("schema cannot be null in getPrimitiveType"); } else if (ModelUtils.isStringSchema(schema) && "number".equals(schema.getFormat())) { // special handle of type: string, format: number return "BigDecimal"; @@ -1300,7 +1300,7 @@ public String getTypeDeclaration(Schema schema) { /** * Determine the type alias for the given type if it exists. This feature - * was original developed for Java because the language does not have a aliasing + * was originally developed for Java because the language does not have an aliasing * mechanism of its own but later extends to handle other languages * * @param name The type name. @@ -2055,7 +2055,7 @@ public CodegenOperation fromOperation(String path, } if (operation == null) - throw new RuntimeException("operation cannnot be null in fromOperation"); + throw new RuntimeException("operation cannot be null in fromOperation"); // store the original operationId for plug-in op.operationIdOriginal = operation.getOperationId(); @@ -3853,7 +3853,7 @@ public static Set getConsumesInfo(OpenAPI openAPI, Operation operation) RequestBody requestBody = ModelUtils.getReferencedRequestBody(openAPI, operation.getRequestBody()); if (requestBody == null || requestBody.getContent() == null || requestBody.getContent().isEmpty()) { - return Collections.emptySet(); // return emtpy set + return Collections.emptySet(); // return empty set } return requestBody.getContent().keySet(); } @@ -4249,7 +4249,7 @@ public CodegenParameter fromRequestBody(RequestBody body, Map sc if (schema.getAdditionalProperties() != null) {// http body is map LOGGER.error("Map should be supported. Please report to openapi-generator github repo about the issue."); } else if (codegenProperty != null) { - LOGGER.warn("The folowing schema has undefined (null) baseType. " + + LOGGER.warn("The following schema has undefined (null) baseType. " + "It could be due to form parameter defined in OpenAPI v2 spec with incorrect consumes. " + "A correct 'consumes' for form parameters should be " + "'application/x-www-form-urlencoded' or 'multipart/form-data'"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index 3eb29c62dc8d..228d1ac59be2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -1012,7 +1012,7 @@ private Map processModels(CodegenConfig config, Map mo = new HashMap(); mo.put("model", cm); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java index 12abb58094ee..5a9a70bcff68 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java @@ -378,7 +378,7 @@ public void postProcessParameter(CodegenParameter parameter) { /** * Post process the media types (produces and consumes) for Ada code generator. *

- * For each media type, add a adaMediaType member that gives the Ada enum constant + * For each media type, add an adaMediaType member that gives the Ada enum constant * for the corresponding type. * * @param types the list of media types. diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java index a385c4ddabb2..4a6a827932b5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java @@ -341,7 +341,7 @@ private void addMustacheLambdas(Map objs) { .build(); if (objs.containsKey("lambda")) { - LOGGER.warn("An property named 'lambda' already exists. Mustache lambdas renamed from 'lambda' to '_lambda'. " + + LOGGER.warn("A property named 'lambda' already exists. Mustache lambdas renamed from 'lambda' to '_lambda'. " + "You'll likely need to use a custom template, " + "see https://github.com/swagger-api/swagger-codegen#modifying-the-client-library-format. "); objs.put("_lambda", lambdas); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java index 54295a751438..5da9953f6364 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java @@ -229,7 +229,7 @@ private void addMustacheLambdas(Map objs) { .build(); if (objs.containsKey("lambda")) { - LOGGER.warn("An property named 'lambda' already exists. Mustache lambdas renamed from 'lambda' to '_lambda'. " + + LOGGER.warn("A property named 'lambda' already exists. Mustache lambdas renamed from 'lambda' to '_lambda'. " + "You'll likely need to use a custom template, " + "see https://github.com/swagger-api/swagger-codegen#modifying-the-client-library-format. "); // TODO: update the URL objs.put("_lambda", lambdas); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/URLPathUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/URLPathUtils.java index 52c423f74cf8..2a71b197c8a4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/URLPathUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/URLPathUtils.java @@ -39,7 +39,7 @@ public static URL getServerURL(OpenAPI openAPI) { LOGGER.warn("Server information seems not defined in the spec. Default to {}.", LOCAL_HOST); return getDefaultUrl(); } - // TOOD need a way to obtain all server URLs + // TODO need a way to obtain all server URLs final Server server = servers.get(0); String url = sanitizeUrl(server.getUrl()); @@ -150,4 +150,4 @@ private static URL getDefaultUrl() { return null; } } -} \ No newline at end of file +} diff --git a/modules/openapi-generator/src/main/resources/Ada/README.mustache b/modules/openapi-generator/src/main/resources/Ada/README.mustache index d74b9c912f78..563610833436 100644 --- a/modules/openapi-generator/src/main/resources/Ada/README.mustache +++ b/modules/openapi-generator/src/main/resources/Ada/README.mustache @@ -18,7 +18,7 @@ run the following command: gprbuild -p -P{{projectName}} ``` -After the build is successfull, you will get the server binary +After the build is successful, you will get the server binary in bin/{{packageName}}-server and you can start it as follows: ``` ./bin/{{packageName}}-server diff --git a/modules/openapi-generator/src/main/resources/Eiffel/framework/serialization/api_json_deserializer.mustache b/modules/openapi-generator/src/main/resources/Eiffel/framework/serialization/api_json_deserializer.mustache index 3423a142cb28..07afc39b4eaa 100644 --- a/modules/openapi-generator/src/main/resources/Eiffel/framework/serialization/api_json_deserializer.mustache +++ b/modules/openapi-generator/src/main/resources/Eiffel/framework/serialization/api_json_deserializer.mustache @@ -7,7 +7,7 @@ expanded class feature -- Access from_json (a_val:STRING; a_type: TYPE [detachable ANY] ): detachable ANY - -- Deserialize a a json representation `a_val' to an object + -- Deserialize a json representation `a_val' to an object -- of type `a_type' local conv_from: JSON_BASIC_REFLECTOR_DESERIALIZER diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache index 0c7bbed53151..5af1e2285f93 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache @@ -915,7 +915,7 @@ public class ApiClient { * @param Type * @param response Response * @param returnType Return type - * @throws ApiException If the response has a unsuccessful status code or + * @throws ApiException If the response has an unsuccessful status code or * fail to deserialize the response body * @return Type */ diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/README.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/README.mustache index b10f3dca28a6..f824f03035fc 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/README.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/README.mustache @@ -12,7 +12,7 @@ This is an example of building a OpenAPI-enabled server in Java using the Spring The underlying library integrating OpenAPI to SpringBoot is [springfox](https://github.com/springfox/springfox) {{/useSpringfox}} -Start your server as an simple java application +Start your server as a simple java application {{^reactive}} You can view the api documentation in swagger-ui by pointing to @@ -46,4 +46,4 @@ public interface PetClient extends PetApi { } ``` -{{/interfaceOnly}} \ No newline at end of file +{{/interfaceOnly}} diff --git a/modules/openapi-generator/src/main/resources/cpprest/multipart-header.mustache b/modules/openapi-generator/src/main/resources/cpprest/multipart-header.mustache index 17dba42a34ae..c34109e989eb 100644 --- a/modules/openapi-generator/src/main/resources/cpprest/multipart-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpprest/multipart-header.mustache @@ -2,7 +2,7 @@ /* * MultipartFormData.h * - * This class represents a container for building a application/x-multipart-formdata requests. + * This class represents a container for building application/x-multipart-formdata requests. */ #ifndef {{modelHeaderGuardPrefix}}_MultipartFormData_H_ diff --git a/modules/openapi-generator/src/main/resources/elixir/connection.ex.mustache b/modules/openapi-generator/src/main/resources/elixir/connection.ex.mustache index 9e10634e2856..052a9d357e47 100644 --- a/modules/openapi-generator/src/main/resources/elixir/connection.ex.mustache +++ b/modules/openapi-generator/src/main/resources/elixir/connection.ex.mustache @@ -58,7 +58,7 @@ defmodule {{moduleName}}.Connection do {{/isOAuth}} {{#isBasic}} @doc """ - Configure an client connection using Basic authentication. + Configure a client connection using Basic authentication. ## Parameters diff --git a/modules/openapi-generator/src/main/resources/flash/ApiClientEvent.as b/modules/openapi-generator/src/main/resources/flash/ApiClientEvent.as index 964dbc26d692..abb0fe121fb2 100644 --- a/modules/openapi-generator/src/main/resources/flash/ApiClientEvent.as +++ b/modules/openapi-generator/src/main/resources/flash/ApiClientEvent.as @@ -11,7 +11,7 @@ import flash.events.Event; public class ApiClientEvent extends Event{ /** - * Event type to indicate a unsuccessful invocation + * Event type to indicate an unsuccessful invocation */ public static const FAILURE_EVENT:String = "unsuccesfulInvocation"; @@ -33,4 +33,4 @@ public class ApiClientEvent extends Event{ super(type, bubbles, cancelable); } } -} \ No newline at end of file +} diff --git a/modules/openapi-generator/src/main/resources/flash/build.xml b/modules/openapi-generator/src/main/resources/flash/build.xml index da3c67f83443..dedf7e030081 100644 --- a/modules/openapi-generator/src/main/resources/flash/build.xml +++ b/modules/openapi-generator/src/main/resources/flash/build.xml @@ -15,7 +15,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -189,4 +189,4 @@ - \ No newline at end of file + diff --git a/modules/openapi-generator/src/main/resources/flaskConnexion/util.mustache b/modules/openapi-generator/src/main/resources/flaskConnexion/util.mustache index 4321570d5a0e..c7340cd00059 100644 --- a/modules/openapi-generator/src/main/resources/flaskConnexion/util.mustache +++ b/modules/openapi-generator/src/main/resources/flaskConnexion/util.mustache @@ -51,7 +51,7 @@ def _deserialize_primitive(data, klass): def _deserialize_object(value): - """Return a original value. + """Return an original value. :return: object. """ diff --git a/modules/openapi-generator/src/main/resources/go/configuration.mustache b/modules/openapi-generator/src/main/resources/go/configuration.mustache index ccea4ba3876c..81d3a41b7bdf 100644 --- a/modules/openapi-generator/src/main/resources/go/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/go/configuration.mustache @@ -16,7 +16,7 @@ func (c contextKey) String() string { } var ( - // ContextOAuth2 takes a oauth2.TokenSource as authentication for the request. + // ContextOAuth2 takes an oauth2.TokenSource as authentication for the request. ContextOAuth2 = contextKey("token") // ContextBasicAuth takes BasicAuth as authentication for the request. diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/readme.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/readme.mustache index d56055c1e0c2..9867e11590b6 100644 --- a/modules/openapi-generator/src/main/resources/java-pkmst/readme.mustache +++ b/modules/openapi-generator/src/main/resources/java-pkmst/readme.mustache @@ -17,9 +17,9 @@ g)Allow you to integrate with tracing server (Example Zipkin) h)Allow you to capture log in your microservice and send to Log management server (Ex ELK or splunk) i)Allow you to configure Oauth2 security based authorization for your microservice - Additonal Features + Additional Features j)generate sample cucumber file and dependency to drive your Behaviour driven development. - k)generate gatling based perfromance test , which can be excuted via build pipeline like jenkins etc. + k)generate gatling based performance test, which can be excuted via build pipeline like jenkins etc. Working: @@ -136,7 +136,7 @@ HttpLogging filter is provided for logging in the request and response. Can be f Spring security is also provided to secure the resources. Please modify according to your needs. First run: -Import the project in to the eclipse. Run the app as an spring boot application.The project will run on http://localhost:8008 +Import the project in to the eclipse. Run the app as a spring boot application.The project will run on http://localhost:8008 Swagger ui available on: http://localhost:8008/swagger-ui.html If all the configurations have been enabled(depending on the port) below are some of the URls to access: @@ -152,4 +152,4 @@ Pkmst examples https://github.com/ProKarma-Inc/pkmst-getting-started-examples Pkmst Extensions -https://github.com/ProKarma-Inc/pkmst-extention \ No newline at end of file +https://github.com/ProKarma-Inc/pkmst-extention diff --git a/modules/openapi-generator/src/main/resources/objc/DefaultConfiguration-header.mustache b/modules/openapi-generator/src/main/resources/objc/DefaultConfiguration-header.mustache index 438ddb5b38c4..f64bb5b0614a 100644 --- a/modules/openapi-generator/src/main/resources/objc/DefaultConfiguration-header.mustache +++ b/modules/openapi-generator/src/main/resources/objc/DefaultConfiguration-header.mustache @@ -82,7 +82,7 @@ /** * Sets API key * - * To remove a apiKey for an identifier, just set the apiKey to nil. + * To remove an apiKey for an identifier, just set the apiKey to nil. * * @param apiKey API key or token. * @param identifier API key identifier (authentication schema). diff --git a/modules/openapi-generator/src/main/resources/objc/ResponseDeserializer-header.mustache b/modules/openapi-generator/src/main/resources/objc/ResponseDeserializer-header.mustache index 774fe1ee5af5..3ee2ecbdb861 100644 --- a/modules/openapi-generator/src/main/resources/objc/ResponseDeserializer-header.mustache +++ b/modules/openapi-generator/src/main/resources/objc/ResponseDeserializer-header.mustache @@ -38,7 +38,7 @@ extern NSInteger const {{classPrefix}}UnknownResponseObjectErrorCode; @interface {{classPrefix}}ResponseDeserializer : NSObject <{{classPrefix}}ResponseDeserializer> /** - * If an null value occurs in dictionary or array if set to YES whole response will be invalid else will be ignored + * If a null value occurs in dictionary or array if set to YES whole response will be invalid else will be ignored * @default NO */ @property (nonatomic, assign) BOOL treatNullAsError; diff --git a/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache b/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache index 6f22dd8ab408..3b526da5fec8 100644 --- a/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache +++ b/modules/openapi-generator/src/main/resources/php/ObjectSerializer.mustache @@ -213,7 +213,7 @@ class ObjectSerializer * @param string[] $httpHeaders HTTP headers * @param string $discriminator discriminator if polymorphism is used * - * @return object|array|null an single or an array of $class instances + * @return object|array|null a single or an array of $class instances */ public static function deserialize($data, $class, $httpHeaders = null) { diff --git a/modules/openapi-generator/src/main/resources/python/api_client.mustache b/modules/openapi-generator/src/main/resources/python/api_client.mustache index b04422982835..61807efaec75 100644 --- a/modules/openapi-generator/src/main/resources/python/api_client.mustache +++ b/modules/openapi-generator/src/main/resources/python/api_client.mustache @@ -552,7 +552,7 @@ class ApiClient(object): return data def __deserialize_object(self, value): - """Return a original value. + """Return an original value. :return: object. """ diff --git a/modules/openapi-generator/src/main/resources/tizen/Doxyfile.mustache b/modules/openapi-generator/src/main/resources/tizen/Doxyfile.mustache index f306cd7bcf69..a1bae5840c68 100644 --- a/modules/openapi-generator/src/main/resources/tizen/Doxyfile.mustache +++ b/modules/openapi-generator/src/main/resources/tizen/Doxyfile.mustache @@ -46,7 +46,7 @@ PROJECT_NUMBER = {{#openAPI}}{{#info}}{{version}}{{/info}}{{/openAPI}} PROJECT_BRIEF = "An SDK for creating client applications for {{#openAPI}}{{#info}}{{title}}{{/info}}{{/openAPI}} on Tizen Platform (http://tizen.org/)" -# With the PROJECT_LOGO tag one can specify an logo or icon that is included in +# With the PROJECT_LOGO tag one can specify a logo or icon that is included in # the documentation. The maximum height of the logo should not exceed 55 pixels # and the maximum width should not exceed 200 pixels. Doxygen will copy the logo # to the output directory. diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/README.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/README.mustache index 0139231eaff2..4cf502cb67a4 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/README.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/README.mustache @@ -19,7 +19,7 @@ It can be used in both TypeScript and JavaScript. In TypeScript, the definition ### Building -To build an compile the typescript sources to javascript use: +To build and compile the typescript sources to javascript use: ``` npm install npm run build diff --git a/modules/openapi-generator/src/main/resources/typescript-inversify/README.mustache b/modules/openapi-generator/src/main/resources/typescript-inversify/README.mustache index 4da4e854d960..2156b184ba43 100644 --- a/modules/openapi-generator/src/main/resources/typescript-inversify/README.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-inversify/README.mustache @@ -2,7 +2,7 @@ ### Building -To build an compile the typescript sources to javascript use: +To build and compile the typescript sources to javascript use: ``` npm install npm run build diff --git a/modules/openapi-generator/src/main/resources/typescript-jquery/README.mustache b/modules/openapi-generator/src/main/resources/typescript-jquery/README.mustache index 31fe0fd5b001..ef14fdbbf334 100644 --- a/modules/openapi-generator/src/main/resources/typescript-jquery/README.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-jquery/README.mustache @@ -19,7 +19,7 @@ It can be used in both TypeScript and JavaScript. In TypeScript, the definition ### Building -To build an compile the typescript sources to javascript use: +To build and compile the typescript sources to javascript use: ``` npm install npm run build diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CSharpModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CSharpModelTest.java index 9aba711b9f41..0232ec3e7b5d 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CSharpModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CSharpModelTest.java @@ -322,7 +322,7 @@ public void arrayModelTest() { Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Children")).size(), 1); } - @Test(description = "convert an map model") + @Test(description = "convert a map model") public void mapModelTest() { final Schema schema = new Schema() .description("a map model") diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/GoModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/GoModelTest.java index 5f67a83299a0..55e71df8aef6 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/GoModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/GoModelTest.java @@ -238,7 +238,7 @@ public void arrayModelTest() { Assert.assertEquals(cm.imports.size(), 1); } - @Test(description = "convert an map model") + @Test(description = "convert a map model") public void mapModelTest() { final Schema model = new Schema() .additionalProperties(new Schema().$ref("#/definitions/Children")) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java index 96bc926f1881..701d90fa0a74 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java @@ -384,17 +384,17 @@ public void arrayModelTest() { Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("ApiModel", "List", "ArrayList", "Children")).size(), 4); } - @Test(description = "convert an map model") + @Test(description = "convert a map model") public void mapModelTest() { final Schema schema = new Schema() - .description("an map model") + .description("a map model") .additionalProperties(new Schema().$ref("#/components/schemas/Children")); final DefaultCodegen codegen = new JavaClientCodegen(); final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema)); Assert.assertEquals(cm.name, "sample"); Assert.assertEquals(cm.classname, "Sample"); - Assert.assertEquals(cm.description, "an map model"); + Assert.assertEquals(cm.description, "a map model"); Assert.assertEquals(cm.vars.size(), 0); Assert.assertEquals(cm.parent, "HashMap"); Assert.assertEquals(cm.imports.size(), 4); @@ -1007,7 +1007,7 @@ public void arraySchemaTestInRequestBody() { Assert.assertTrue(co.imports.contains("Pet")); } - @Test(description = "convert an array schema in a ApiResponse") + @Test(description = "convert an array schema in an ApiResponse") public void arraySchemaTestInOperationResponse() { final Schema testSchema = new ArraySchema() .items(new Schema<>().$ref("#/components/schemas/Pet")); @@ -1029,7 +1029,7 @@ public void arraySchemaTestInOperationResponse() { Assert.assertTrue(co.imports.contains("Pet")); } - @Test(description = "convert a array of array schema") + @Test(description = "convert an array of array schema") public void arrayOfArraySchemaTest() { final Schema testSchema = new ObjectSchema() .addProperties("pets", new ArraySchema() @@ -1087,7 +1087,7 @@ public void arrayOfArraySchemaTestInRequestBody() { Assert.assertTrue(co.imports.contains("List")); } - @Test(description = "convert a array schema in a ApiResponse") + @Test(description = "convert an array schema in an ApiResponse") public void arrayOfArraySchemaTestInOperationResponse() { final Schema testSchema = new ArraySchema() .items(new ArraySchema() diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/objc/ObjcModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/objc/ObjcModelTest.java index 4a4aac68d211..99279bd2f10a 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/objc/ObjcModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/objc/ObjcModelTest.java @@ -47,7 +47,7 @@ @SuppressWarnings("static-method") public class ObjcModelTest { - @Test(description = "convert a model with a advanced map property") + @Test(description = "convert a model with an advanced map property") public void advancedMapPropertyTest() { final Schema model = new Schema() .description("a sample model") @@ -282,7 +282,7 @@ public void arrayModelTest() { Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("OAIChildren")).size(), 1); } - @Test(description = "convert an map model") + @Test(description = "convert a map model") public void mapModelTest() { final Schema model = new Schema() .description("a map model for testing ObjC generator") diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/PhpModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/PhpModelTest.java index 8e496e294a81..27f76bc236c1 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/PhpModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/PhpModelTest.java @@ -255,7 +255,7 @@ public void arrayModelTest() { // skip import test as import is not used by PHP codegen } - @Test(description = "convert an map model") + @Test(description = "convert a map model") public void mapModelTest() { final Schema model = new Schema() .description("a map model") diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonTest.java index 105eded56fcf..655ed844b4d4 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonTest.java @@ -272,7 +272,7 @@ public void arrayModelTest() { } // should not start with 'null'. need help from the community to investigate further - @Test(description = "convert an map model") + @Test(description = "convert a map model") public void mapModelTest() { final Schema model = new Schema() .description("a map model") diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientCodegenTest.java index cd08c59cb5b7..acc12cc6d4ac 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientCodegenTest.java @@ -251,7 +251,7 @@ public void arrayModelTest() { Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("ListBuffer", "Children")).size(), 2); } - @Test(description = "convert an map model") + @Test(description = "convert a map model") public void mapModelTest() { final Schema model = new Schema() .description("a map model") diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalahttpclient/ScalaHttpClientModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalahttpclient/ScalaHttpClientModelTest.java index 092e800b07b2..db217b409ffe 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalahttpclient/ScalaHttpClientModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalahttpclient/ScalaHttpClientModelTest.java @@ -250,7 +250,7 @@ public void arrayModelTest() { Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("ListBuffer", "Children")).size(), 2); } - @Test(description = "convert an map model") + @Test(description = "convert a map model") public void mapModelTest() { final Schema model = new Schema() .description("a map model") diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/ModelUtilsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/ModelUtilsTest.java index 9927008ffd92..ac9648e0243e 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/ModelUtilsTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/ModelUtilsTest.java @@ -92,11 +92,11 @@ public void testSchemasUsedOnlyInFormParam() { final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/unusedSchemas.yaml", null, new ParseOptions()).getOpenAPI(); List unusedSchemas = ModelUtils.getSchemasUsedOnlyInFormParam(openAPI); Assert.assertEquals(unusedSchemas.size(), 3); - //SomeObj2 is only used in a 'application/x-www-form-urlencoded' request + //SomeObj2 is only used in an 'application/x-www-form-urlencoded' request Assert.assertTrue(unusedSchemas.contains("SomeObj2"), "contains 'SomeObj2'"); //SomeObj3 is only used in a 'multipart/form-data' request Assert.assertTrue(unusedSchemas.contains("SomeObj3"), "contains 'SomeObj3'"); - //SomeObj7 is only used in a 'application/x-www-form-urlencoded' request (with referenced request body) + //SomeObj7 is only used in an 'application/x-www-form-urlencoded' request (with referenced request body) Assert.assertTrue(unusedSchemas.contains("SomeObj7"), "contains 'SomeObj7'"); } diff --git a/modules/openapi-generator/src/test/resources/2_0/swift4Test.json b/modules/openapi-generator/src/test/resources/2_0/swift4Test.json index c2f217bf84e1..f5e60112f051 100644 --- a/modules/openapi-generator/src/test/resources/2_0/swift4Test.json +++ b/modules/openapi-generator/src/test/resources/2_0/swift4Test.json @@ -377,7 +377,7 @@ }, "SampleBase": { "type": "object", - "description": "This is an base class object from which other classes will derive.", + "description": "This is a base class object from which other classes will derive.", "properties": { "baseClassStringProp": { "type": "string" @@ -389,7 +389,7 @@ } }, "SampleSubClass": { - "description": "This is an subclass defived from the SampleBase class.", + "description": "This is a subclass defived from the SampleBase class.", "allOf": [ { "$ref": "#/definitions/SampleBase" @@ -423,7 +423,7 @@ } }, "PersonCard": { - "description": "This is an card object for a Person derived from BaseCard.", + "description": "This is a card object for a Person derived from BaseCard.", "x-unit-tests": ["B45"], "allOf": [ { @@ -443,7 +443,7 @@ ] }, "PlaceCard": { - "description": "This is an card object for a Person derived from BaseCard.", + "description": "This is a card object for a Person derived from BaseCard.", "x-unit-tests": ["B45"], "allOf": [ { diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/README.md b/modules/openapi-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/README.md index 654efaf000bf..3ae010d2a430 100644 --- a/modules/openapi-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/README.md +++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/README.md @@ -2,7 +2,7 @@ ### Building -To build an compile the typescript sources to javascript use: +To build and compile the typescript sources to javascript use: ``` npm install npm run build @@ -41,4 +41,4 @@ import { BASE_PATH } from './path-to-swagger-gen-service/index'; bootstrap(AppComponent, [ { provide: BASE_PATH, useValue: 'https://your-web-service.com' }, ]); -``` \ No newline at end of file +``` diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/README.md b/modules/openapi-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/README.md index fbcbf6e6dcd2..0dead26a31e0 100644 --- a/modules/openapi-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/README.md +++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/README.md @@ -2,7 +2,7 @@ ### Building -To build an compile the typescript sources to javascript use: +To build and compile the typescript sources to javascript use: ``` npm install npm run build @@ -41,4 +41,4 @@ import { BASE_PATH } from './path-to-swagger-gen-service/index'; bootstrap(AppComponent, [ { provide: BASE_PATH, useValue: 'https://your-web-service.com' }, ]); -``` \ No newline at end of file +``` diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-expected/README.md b/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-expected/README.md index 3f1d74e23e8f..25b7aaaf39a5 100644 --- a/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-expected/README.md +++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-expected/README.md @@ -2,7 +2,7 @@ ### Building -To build an compile the typescript sources to javascript use: +To build and compile the typescript sources to javascript use: ``` npm install npm run build @@ -41,4 +41,4 @@ import { BASE_PATH } from './path-to-swagger-gen-service/index'; bootstrap(AppComponent, [ { provide: BASE_PATH, useValue: 'https://your-web-service.com' }, ]); -``` \ No newline at end of file +``` diff --git a/shippable.yml b/shippable.yml index 686b1ecc1ed4..937c34b9ff3e 100644 --- a/shippable.yml +++ b/shippable.yml @@ -13,7 +13,7 @@ build: - mvn --quiet clean install # ensure all modifications created by 'mature' generators are in the git repo - ./bin/utils/ensure-up-to-date - # prepare enviroment for tests + # prepare environment for tests - sudo apt-get update -qq # install stack - curl -sSL https://get.haskellstack.org/ | sh