Add unit tests for unmarshaling of discriminators with special charac…

…ters

bin/configs/java-jersey2-special-characters.yaml

@@ -0,0 +1,15 @@
+generatorName: java
+outputDir: samples/openapi3/client/petstore/java/jersey2-java8-special-characters
+library: jersey2
+inputSpec: modules/openapi-generator/src/test/resources/3_0/schema-with-special-characters.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  artifactId: petstore-openapi3-jersey2-java8-special-characters
+  hideGenerationTimestamp: true
+  serverPort: "8082"
+  dateLibrary: java8
+  useOneOfDiscriminatorLookup: true
+  disallowAdditionalPropertiesIfNotPresent: false
+systemProperties:
+  skipValidateSpec: "false"
+

modules/openapi-generator/src/test/resources/3_0/schema-with-special-characters.yaml

@@ -22,10 +22,18 @@ components:
   schemas:
     Parent:
       properties:
-        prop1:
+        objectType:
           type: string
       discriminator:
-        propertyName: prop1
+        propertyName: objectType
+    ChildSchema:
+      description: A schema that does not have any special character.
+      allOf:
+        - $ref: '#/components/schemas/Parent'
+        - type: object
+          properties:
+            prop1:
+              type: string
     # Note: the name below with non-ASCII characters is a valid JSON schema name,
     # however currently OpenAPI generator does not allow special characters beyond [.-_]
     #
@@ -48,6 +56,10 @@ components:
             prop2:
               type: string
     # Below is a schema with the same name, except special characters have been removed.
+    # This causes a codegen issue because the generated code will have exactly the same class name
+    # as the above 'MySchemaName._-Characters'.
+    # Hence the schema is commented out for now.
+    #
     #MySchemaNameCharacters:
     #  description:
     #    A schema with same name as above, without the special characters. 
@@ -56,4 +68,4 @@ components:
     #    - type: object
     #      properties:
     #        prop2:
-    #          type: string
+    #          type: string

samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.gitignore

@@ -0,0 +1,21 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# exclude jar for gradle wrapper
+!gradle/wrapper/*.jar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# build files
+**/target
+target
+.gradle
+build

samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.openapi-generator-ignore

@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.openapi-generator/FILES

@@ -0,0 +1,42 @@
+.gitignore
+.travis.yml
+README.md
+api/openapi.yaml
+build.gradle
+build.sbt
+docs/ChildSchema.md
+docs/ChildSchemaAllOf.md
+docs/DefaultApi.md
+docs/MySchemaNameCharacters.md
+docs/MySchemaNameCharactersAllOf.md
+docs/Parent.md
+git_push.sh
+gradle.properties
+gradle/wrapper/gradle-wrapper.jar
+gradle/wrapper/gradle-wrapper.properties
+gradlew
+gradlew.bat
+pom.xml
+settings.gradle
+src/main/AndroidManifest.xml
+src/main/java/org/openapitools/client/ApiClient.java
+src/main/java/org/openapitools/client/ApiException.java
+src/main/java/org/openapitools/client/ApiResponse.java
+src/main/java/org/openapitools/client/Configuration.java
+src/main/java/org/openapitools/client/JSON.java
+src/main/java/org/openapitools/client/Pair.java
+src/main/java/org/openapitools/client/RFC3339DateFormat.java
+src/main/java/org/openapitools/client/ServerConfiguration.java
+src/main/java/org/openapitools/client/ServerVariable.java
+src/main/java/org/openapitools/client/StringUtil.java
+src/main/java/org/openapitools/client/api/DefaultApi.java
+src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
+src/main/java/org/openapitools/client/auth/Authentication.java
+src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
+src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
+src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
+src/main/java/org/openapitools/client/model/ChildSchema.java
+src/main/java/org/openapitools/client/model/ChildSchemaAllOf.java
+src/main/java/org/openapitools/client/model/MySchemaNameCharacters.java
+src/main/java/org/openapitools/client/model/MySchemaNameCharactersAllOf.java
+src/main/java/org/openapitools/client/model/Parent.java

samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.openapi-generator/VERSION

@@ -0,0 +1 @@
+5.0.0-SNAPSHOT

samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.travis.yml

@@ -0,0 +1,22 @@
+#
+# Generated by OpenAPI Generator: https://openapi-generator.tech
+#
+# Ref: https://docs.travis-ci.com/user/languages/java/
+#
+language: java
+jdk:
+  - openjdk12
+  - openjdk11
+  - openjdk10
+  - openjdk9
+  - openjdk8
+before_install:
+  # ensure gradlew has proper permission
+  - chmod a+x ./gradlew
+script:
+  # test using maven
+  #- mvn test
+  # test using gradle
+  - gradle test
+  # test using sbt 
+  # - sbt test

samples/openapi3/client/petstore/java/jersey2-java8-special-characters/README.md

@@ -0,0 +1,133 @@
+# petstore-openapi3-jersey2-java8-special-characters
+
+test
+
+- API version: 1.0.0
+
+test
+
+
+*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
+
+## Requirements
+
+Building the API client library requires:
+
+1. Java 1.8+
+2. Maven/Gradle
+
+## Installation
+
+To install the API client library to your local Maven repository, simply execute:
+
+```shell
+mvn clean install
+```
+
+To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
+
+```shell
+mvn clean deploy
+```
+
+Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information.
+
+### Maven users
+
+Add this dependency to your project's POM:
+
+```xml
+<dependency>
+  <groupId>org.openapitools</groupId>
+  <artifactId>petstore-openapi3-jersey2-java8-special-characters</artifactId>
+  <version>1.0.0</version>
+  <scope>compile</scope>
+</dependency>
+```
+
+### Gradle users
+
+Add this dependency to your project's build file:
+
+```groovy
+compile "org.openapitools:petstore-openapi3-jersey2-java8-special-characters:1.0.0"
+```
+
+### Others
+
+At first generate the JAR by executing:
+
+```shell
+mvn clean package
+```
+
+Then manually install the following JARs:
+
+- `target/petstore-openapi3-jersey2-java8-special-characters-1.0.0.jar`
+- `target/lib/*.jar`
+
+## Getting Started
+
+Please follow the [installation](#installation) instruction and execute the following Java code:
+
+```java
+
+import org.openapitools.client.*;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.model.*;
+import org.openapitools.client.api.DefaultApi;
+
+public class DefaultApiExample {
+
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://localhost");
+
+        DefaultApi apiInstance = new DefaultApi(defaultClient);
+        MySchemaNameCharacters mySchemaNameCharacters = new MySchemaNameCharacters(); // MySchemaNameCharacters | 
+        try {
+            MySchemaNameCharacters result = apiInstance.testPost(mySchemaNameCharacters);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling DefaultApi#testPost");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *http://localhost*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*DefaultApi* | [**testPost**](docs/DefaultApi.md#testPost) | **POST** /test | 
+
+
+## Documentation for Models
+
+ - [ChildSchema](docs/ChildSchema.md)
+ - [ChildSchemaAllOf](docs/ChildSchemaAllOf.md)
+ - [MySchemaNameCharacters](docs/MySchemaNameCharacters.md)
+ - [MySchemaNameCharactersAllOf](docs/MySchemaNameCharactersAllOf.md)
+ - [Parent](docs/Parent.md)
+
+
+## Documentation for Authorization
+
+All endpoints do not require authorization.
+Authentication schemes defined for the API:
+
+## Recommendation
+
+It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issues.
+
+## Author
+
+
+

samples/openapi3/client/petstore/java/jersey2-java8-special-characters/api/openapi.yaml

@@ -0,0 +1,53 @@
+openapi: 3.0.3
+info:
+  description: test
+  title: test
+  version: 1.0.0
+servers:
+- url: /
+paths:
+  /test:
+    post:
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/MySchemaName._-Characters'
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MySchemaName._-Characters'
+          description: the response
+      x-contentType: application/json
+      x-accepts: application/json
+components:
+  schemas:
+    Parent:
+      discriminator:
+        propertyName: objectType
+      properties:
+        objectType:
+          type: string
+    ChildSchema:
+      allOf:
+      - $ref: '#/components/schemas/Parent'
+      - $ref: '#/components/schemas/ChildSchema_allOf'
+      description: A schema that does not have any special character.
+    MySchemaName._-Characters:
+      allOf:
+      - $ref: '#/components/schemas/Parent'
+      - $ref: '#/components/schemas/MySchemaName___Characters_allOf'
+      description: A schema name that has letters, numbers, punctuation and non-ASCII
+        characters. The sanitization rules should make it possible to generate a language-specific
+        classname with allowed characters in that programming language.
+    ChildSchema_allOf:
+      properties:
+        prop1:
+          type: string
+    MySchemaName___Characters_allOf:
+      properties:
+        prop2:
+          type: string
+