diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java
index dd71b9008f7a..c0a1175bb647 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java
@@ -335,7 +335,7 @@ public class CppUE4ClientCodegen extends AbstractCppCodegen {
     public String modelFilename(String templateName, String modelName) {
         String suffix = modelTemplateFiles().get(templateName);
         String folder = privateFolder;
-        if (suffix == ".h") {
+        if (".h".equals(suffix)) {
             folder = publicFolder;
         }
 
diff --git a/samples/client/petstore/cpp-ue4/.openapi-generator/FILES b/samples/client/petstore/cpp-ue4/.openapi-generator/FILES
index 23079276740b..86943c2aa9b6 100644
--- a/samples/client/petstore/cpp-ue4/.openapi-generator/FILES
+++ b/samples/client/petstore/cpp-ue4/.openapi-generator/FILES
@@ -1,31 +1,31 @@
 OpenAPI.Build.cs
-Private\OpenAPIApiResponse.cpp
-Private\OpenAPIBaseModel.cpp
-Private\OpenAPICategory.cpp
-Private\OpenAPIHelpers.cpp
-Private\OpenAPIModule.cpp
-Private\OpenAPIModule.h
-Private\OpenAPIOrder.cpp
-Private\OpenAPIPet.cpp
-Private\OpenAPIPetApi.cpp
-Private\OpenAPIPetApiOperations.cpp
-Private\OpenAPIStoreApi.cpp
-Private\OpenAPIStoreApiOperations.cpp
-Private\OpenAPITag.cpp
-Private\OpenAPIUser.cpp
-Private\OpenAPIUserApi.cpp
-Private\OpenAPIUserApiOperations.cpp
-Public\OpenAPIApiResponse.h
-Public\OpenAPIBaseModel.h
-Public\OpenAPICategory.h
-Public\OpenAPIHelpers.h
-Public\OpenAPIOrder.h
-Public\OpenAPIPet.h
-Public\OpenAPIPetApi.h
-Public\OpenAPIPetApiOperations.h
-Public\OpenAPIStoreApi.h
-Public\OpenAPIStoreApiOperations.h
-Public\OpenAPITag.h
-Public\OpenAPIUser.h
-Public\OpenAPIUserApi.h
-Public\OpenAPIUserApiOperations.h
+Private/OpenAPIApiResponse.cpp
+Private/OpenAPIBaseModel.cpp
+Private/OpenAPICategory.cpp
+Private/OpenAPIHelpers.cpp
+Private/OpenAPIModule.cpp
+Private/OpenAPIModule.h
+Private/OpenAPIOrder.cpp
+Private/OpenAPIPet.cpp
+Private/OpenAPIPetApi.cpp
+Private/OpenAPIPetApiOperations.cpp
+Private/OpenAPIStoreApi.cpp
+Private/OpenAPIStoreApiOperations.cpp
+Private/OpenAPITag.cpp
+Private/OpenAPIUser.cpp
+Private/OpenAPIUserApi.cpp
+Private/OpenAPIUserApiOperations.cpp
+Public/OpenAPIApiResponse.h
+Public/OpenAPIBaseModel.h
+Public/OpenAPICategory.h
+Public/OpenAPIHelpers.h
+Public/OpenAPIOrder.h
+Public/OpenAPIPet.h
+Public/OpenAPIPetApi.h
+Public/OpenAPIPetApiOperations.h
+Public/OpenAPIStoreApi.h
+Public/OpenAPIStoreApiOperations.h
+Public/OpenAPITag.h
+Public/OpenAPIUser.h
+Public/OpenAPIUserApi.h
+Public/OpenAPIUserApiOperations.h
diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApiOperations.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApiOperations.cpp
index 4df6f9160880..988a9496b146 100644
--- a/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApiOperations.cpp
+++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIPetApiOperations.cpp
@@ -220,7 +220,6 @@ void OpenAPIPetApi::FindPetsByStatusResponse::SetHttpResponseCode(EHttpResponseC
 	switch ((int)InHttpResponseCode)
 	{
 	case 200:
-	default:
 		SetResponseString(TEXT("successful operation"));
 		break;
 	case 400:
@@ -274,7 +273,6 @@ void OpenAPIPetApi::FindPetsByTagsResponse::SetHttpResponseCode(EHttpResponseCod
 	switch ((int)InHttpResponseCode)
 	{
 	case 200:
-	default:
 		SetResponseString(TEXT("successful operation"));
 		break;
 	case 400:
@@ -327,7 +325,6 @@ void OpenAPIPetApi::GetPetByIdResponse::SetHttpResponseCode(EHttpResponseCodes::
 	switch ((int)InHttpResponseCode)
 	{
 	case 200:
-	default:
 		SetResponseString(TEXT("successful operation"));
 		break;
 	case 400:
@@ -541,7 +538,6 @@ void OpenAPIPetApi::UploadFileResponse::SetHttpResponseCode(EHttpResponseCodes::
 	switch ((int)InHttpResponseCode)
 	{
 	case 200:
-	default:
 		SetResponseString(TEXT("successful operation"));
 		break;
 	}
diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIStoreApiOperations.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIStoreApiOperations.cpp
index 6146ed8b9616..9f3c059d9232 100644
--- a/samples/client/petstore/cpp-ue4/Private/OpenAPIStoreApiOperations.cpp
+++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIStoreApiOperations.cpp
@@ -110,7 +110,6 @@ void OpenAPIStoreApi::GetInventoryResponse::SetHttpResponseCode(EHttpResponseCod
 	switch ((int)InHttpResponseCode)
 	{
 	case 200:
-	default:
 		SetResponseString(TEXT("successful operation"));
 		break;
 	}
@@ -160,7 +159,6 @@ void OpenAPIStoreApi::GetOrderByIdResponse::SetHttpResponseCode(EHttpResponseCod
 	switch ((int)InHttpResponseCode)
 	{
 	case 200:
-	default:
 		SetResponseString(TEXT("successful operation"));
 		break;
 	case 400:
@@ -223,7 +221,6 @@ void OpenAPIStoreApi::PlaceOrderResponse::SetHttpResponseCode(EHttpResponseCodes
 	switch ((int)InHttpResponseCode)
 	{
 	case 200:
-	default:
 		SetResponseString(TEXT("successful operation"));
 		break;
 	case 400:
diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIUserApiOperations.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIUserApiOperations.cpp
index 97562911f703..5a698d4fa5c3 100644
--- a/samples/client/petstore/cpp-ue4/Private/OpenAPIUserApiOperations.cpp
+++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIUserApiOperations.cpp
@@ -285,7 +285,6 @@ void OpenAPIUserApi::GetUserByNameResponse::SetHttpResponseCode(EHttpResponseCod
 	switch ((int)InHttpResponseCode)
 	{
 	case 200:
-	default:
 		SetResponseString(TEXT("successful operation"));
 		break;
 	case 400:
@@ -343,7 +342,6 @@ void OpenAPIUserApi::LoginUserResponse::SetHttpResponseCode(EHttpResponseCodes::
 	switch ((int)InHttpResponseCode)
 	{
 	case 200:
-	default:
 		SetResponseString(TEXT("successful operation"));
 		break;
 	case 400: