Created by: ramzimaalej
Fix the following issues:
https://sonarcloud.io/project/issues?id=org.openapitools%3Aopenapi-generator-project&open=AWUi1WNYg-pHJSBwrBAz&resolved=false&types=BUG
https://sonarcloud.io/project/issues?id=org.openapitools%3Aopenapi-generator-project&open=AWUi1WPRg-pHJSBwrBKT&resolved=false&types=BUG
https://sonarcloud.io/project/issues?id=org.openapitools%3Aopenapi-generator-project&open=AWUi1WPRg-pHJSBwrBKU&resolved=false&types=BUG
https://sonarcloud.io/project/issues?id=org.openapitools%3Aopenapi-generator-project&open=AWUi1WPRg-pHJSBwrBMR&resolved=false&types=BUG
@wing328