diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CppRestClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CppRestClientCodegen.java
index 6053939fa4e..e1a79f4d576 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CppRestClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CppRestClientCodegen.java
@@ -312,10 +312,10 @@ public class CppRestClientCodegen extends DefaultCodegen implements CodegenConfi
             return "0.0";
         } else if (p instanceof FloatProperty) {
             return "0.0f";
-        } else if (p instanceof IntegerProperty || p instanceof BaseIntegerProperty) {
-            return "0";
         } else if (p instanceof LongProperty) {
             return "0L";
+        } else if (p instanceof IntegerProperty || p instanceof BaseIntegerProperty) {
+            return "0";
         } else if (p instanceof DecimalProperty) {
             return "0.0";
         } else if (p instanceof MapProperty) {
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PistacheServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PistacheServerCodegen.java
index a56ef44710a..0eb83a5e2eb 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PistacheServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PistacheServerCodegen.java
@@ -286,10 +286,10 @@ public class PistacheServerCodegen extends DefaultCodegen implements CodegenConf
             return "0.0";
         } else if (p instanceof FloatProperty) {
             return "0.0f";
-        } else if (p instanceof IntegerProperty || p instanceof BaseIntegerProperty) {
-            return "0";
         } else if (p instanceof LongProperty) {
             return "0L";
+        } else if (p instanceof IntegerProperty || p instanceof BaseIntegerProperty) {
+            return "0";
         } else if (p instanceof DecimalProperty) {
             return "0.0";
         } else if (p instanceof MapProperty) {
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RestbedCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RestbedCodegen.java
index 730d6e075b6..dcd4c75988a 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RestbedCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RestbedCodegen.java
@@ -318,10 +318,10 @@ public class RestbedCodegen extends DefaultCodegen implements CodegenConfig {
           return "0.0";
       } else if (p instanceof FloatProperty) {
           return "0.0f";
-      } else if (p instanceof IntegerProperty || p instanceof BaseIntegerProperty) {
-          return "0";
       } else if (p instanceof LongProperty) {
           return "0L";
+      } else if (p instanceof IntegerProperty || p instanceof BaseIntegerProperty) {
+          return "0";
       } else if (p instanceof DecimalProperty) {
           return "0.0";
       } else if (p instanceof MapProperty) {
diff --git a/samples/client/petstore/cpprest/model/Category.cpp b/samples/client/petstore/cpprest/model/Category.cpp
index 4d185607149..24bdc66c132 100644
--- a/samples/client/petstore/cpprest/model/Category.cpp
+++ b/samples/client/petstore/cpprest/model/Category.cpp
@@ -21,7 +21,7 @@ namespace model {
 
 Category::Category()
 {
-    m_Id = 0;
+    m_Id = 0L;
     m_IdIsSet = false;
     m_Name = U("");
     m_NameIsSet = false;
diff --git a/samples/client/petstore/cpprest/model/Order.cpp b/samples/client/petstore/cpprest/model/Order.cpp
index b205701b76f..24f3b7e46cc 100644
--- a/samples/client/petstore/cpprest/model/Order.cpp
+++ b/samples/client/petstore/cpprest/model/Order.cpp
@@ -21,9 +21,9 @@ namespace model {
 
 Order::Order()
 {
-    m_Id = 0;
+    m_Id = 0L;
     m_IdIsSet = false;
-    m_PetId = 0;
+    m_PetId = 0L;
     m_PetIdIsSet = false;
     m_Quantity = 0;
     m_QuantityIsSet = false;
diff --git a/samples/client/petstore/cpprest/model/Pet.cpp b/samples/client/petstore/cpprest/model/Pet.cpp
index 5d8a4bb9725..a89406497f6 100644
--- a/samples/client/petstore/cpprest/model/Pet.cpp
+++ b/samples/client/petstore/cpprest/model/Pet.cpp
@@ -21,7 +21,7 @@ namespace model {
 
 Pet::Pet()
 {
-    m_Id = 0;
+    m_Id = 0L;
     m_IdIsSet = false;
     m_CategoryIsSet = false;
     m_Name = U("");
diff --git a/samples/client/petstore/cpprest/model/Tag.cpp b/samples/client/petstore/cpprest/model/Tag.cpp
index 6d5e350ab91..050bcc2d488 100644
--- a/samples/client/petstore/cpprest/model/Tag.cpp
+++ b/samples/client/petstore/cpprest/model/Tag.cpp
@@ -21,7 +21,7 @@ namespace model {
 
 Tag::Tag()
 {
-    m_Id = 0;
+    m_Id = 0L;
     m_IdIsSet = false;
     m_Name = U("");
     m_NameIsSet = false;
diff --git a/samples/client/petstore/cpprest/model/User.cpp b/samples/client/petstore/cpprest/model/User.cpp
index 3cf4e4258d5..9ec72d1ac98 100644
--- a/samples/client/petstore/cpprest/model/User.cpp
+++ b/samples/client/petstore/cpprest/model/User.cpp
@@ -21,7 +21,7 @@ namespace model {
 
 User::User()
 {
-    m_Id = 0;
+    m_Id = 0L;
     m_IdIsSet = false;
     m_Username = U("");
     m_UsernameIsSet = false;
diff --git a/samples/server/petstore/pistache-server/model/Category.cpp b/samples/server/petstore/pistache-server/model/Category.cpp
index 544f71241da..966fb4a2262 100644
--- a/samples/server/petstore/pistache-server/model/Category.cpp
+++ b/samples/server/petstore/pistache-server/model/Category.cpp
@@ -20,7 +20,7 @@ namespace model {
 
 Category::Category()
 {
-    m_Id = 0;
+    m_Id = 0L;
     m_IdIsSet = false;
     m_Name = "";
     m_NameIsSet = false;
diff --git a/samples/server/petstore/pistache-server/model/Order.cpp b/samples/server/petstore/pistache-server/model/Order.cpp
index 7e249eb341b..d1a94778deb 100644
--- a/samples/server/petstore/pistache-server/model/Order.cpp
+++ b/samples/server/petstore/pistache-server/model/Order.cpp
@@ -20,9 +20,9 @@ namespace model {
 
 Order::Order()
 {
-    m_Id = 0;
+    m_Id = 0L;
     m_IdIsSet = false;
-    m_PetId = 0;
+    m_PetId = 0L;
     m_PetIdIsSet = false;
     m_Quantity = 0;
     m_QuantityIsSet = false;
diff --git a/samples/server/petstore/pistache-server/model/Pet.cpp b/samples/server/petstore/pistache-server/model/Pet.cpp
index 1f5cfe2d7e8..7fad21e5e61 100644
--- a/samples/server/petstore/pistache-server/model/Pet.cpp
+++ b/samples/server/petstore/pistache-server/model/Pet.cpp
@@ -20,7 +20,7 @@ namespace model {
 
 Pet::Pet()
 {
-    m_Id = 0;
+    m_Id = 0L;
     m_IdIsSet = false;
     m_CategoryIsSet = false;
     m_Name = "";
diff --git a/samples/server/petstore/pistache-server/model/Tag.cpp b/samples/server/petstore/pistache-server/model/Tag.cpp
index 0854613f58b..a020e73a139 100644
--- a/samples/server/petstore/pistache-server/model/Tag.cpp
+++ b/samples/server/petstore/pistache-server/model/Tag.cpp
@@ -20,7 +20,7 @@ namespace model {
 
 Tag::Tag()
 {
-    m_Id = 0;
+    m_Id = 0L;
     m_IdIsSet = false;
     m_Name = "";
     m_NameIsSet = false;
diff --git a/samples/server/petstore/pistache-server/model/User.cpp b/samples/server/petstore/pistache-server/model/User.cpp
index c916d14842e..052587ab16f 100644
--- a/samples/server/petstore/pistache-server/model/User.cpp
+++ b/samples/server/petstore/pistache-server/model/User.cpp
@@ -20,7 +20,7 @@ namespace model {
 
 User::User()
 {
-    m_Id = 0;
+    m_Id = 0L;
     m_IdIsSet = false;
     m_Username = "";
     m_UsernameIsSet = false;
diff --git a/samples/server/petstore/restbed/model/Category.cpp b/samples/server/petstore/restbed/model/Category.cpp
index e5a38f26420..34f0bf8af0b 100644
--- a/samples/server/petstore/restbed/model/Category.cpp
+++ b/samples/server/petstore/restbed/model/Category.cpp
@@ -30,7 +30,7 @@ namespace model {
 
 Category::Category()
 {
-    m_Id = 0;
+    m_Id = 0L;
     m_Name = "";
     
 }
@@ -54,7 +54,7 @@ void Category::fromJsonString(std::string const& jsonString)
 	std::stringstream ss(jsonString);
 	ptree pt;
 	read_json(ss,pt);
-	m_Id = pt.get("Id", 0);
+	m_Id = pt.get("Id", 0L);
 	m_Name = pt.get("Name", "");
 }
 
diff --git a/samples/server/petstore/restbed/model/Order.cpp b/samples/server/petstore/restbed/model/Order.cpp
index b6e97cecd1c..4c14639d10f 100644
--- a/samples/server/petstore/restbed/model/Order.cpp
+++ b/samples/server/petstore/restbed/model/Order.cpp
@@ -30,8 +30,8 @@ namespace model {
 
 Order::Order()
 {
-    m_Id = 0;
-    m_PetId = 0;
+    m_Id = 0L;
+    m_PetId = 0L;
     m_Quantity = 0;
     m_ShipDate = "";
     m_Status = "";
@@ -62,8 +62,8 @@ void Order::fromJsonString(std::string const& jsonString)
 	std::stringstream ss(jsonString);
 	ptree pt;
 	read_json(ss,pt);
-	m_Id = pt.get("Id", 0);
-	m_PetId = pt.get("PetId", 0);
+	m_Id = pt.get("Id", 0L);
+	m_PetId = pt.get("PetId", 0L);
 	m_Quantity = pt.get("Quantity", 0);
 	m_ShipDate = pt.get("ShipDate", "");
 	m_Status = pt.get("Status", "");
diff --git a/samples/server/petstore/restbed/model/Pet.cpp b/samples/server/petstore/restbed/model/Pet.cpp
index 1889dc891a8..9f4ce7d6146 100644
--- a/samples/server/petstore/restbed/model/Pet.cpp
+++ b/samples/server/petstore/restbed/model/Pet.cpp
@@ -30,7 +30,7 @@ namespace model {
 
 Pet::Pet()
 {
-    m_Id = 0;
+    m_Id = 0L;
     m_Name = "";
     m_Status = "";
     
@@ -56,7 +56,7 @@ void Pet::fromJsonString(std::string const& jsonString)
 	std::stringstream ss(jsonString);
 	ptree pt;
 	read_json(ss,pt);
-	m_Id = pt.get("Id", 0);
+	m_Id = pt.get("Id", 0L);
 	m_Name = pt.get("Name", "");
 	m_Status = pt.get("Status", "");
 }
diff --git a/samples/server/petstore/restbed/model/Tag.cpp b/samples/server/petstore/restbed/model/Tag.cpp
index a23bb9f767f..ac2fb1f3f4b 100644
--- a/samples/server/petstore/restbed/model/Tag.cpp
+++ b/samples/server/petstore/restbed/model/Tag.cpp
@@ -30,7 +30,7 @@ namespace model {
 
 Tag::Tag()
 {
-    m_Id = 0;
+    m_Id = 0L;
     m_Name = "";
     
 }
@@ -54,7 +54,7 @@ void Tag::fromJsonString(std::string const& jsonString)
 	std::stringstream ss(jsonString);
 	ptree pt;
 	read_json(ss,pt);
-	m_Id = pt.get("Id", 0);
+	m_Id = pt.get("Id", 0L);
 	m_Name = pt.get("Name", "");
 }
 
diff --git a/samples/server/petstore/restbed/model/User.cpp b/samples/server/petstore/restbed/model/User.cpp
index be22d9bc9ef..d80b59b38e3 100644
--- a/samples/server/petstore/restbed/model/User.cpp
+++ b/samples/server/petstore/restbed/model/User.cpp
@@ -30,7 +30,7 @@ namespace model {
 
 User::User()
 {
-    m_Id = 0;
+    m_Id = 0L;
     m_Username = "";
     m_FirstName = "";
     m_LastName = "";
@@ -66,7 +66,7 @@ void User::fromJsonString(std::string const& jsonString)
 	std::stringstream ss(jsonString);
 	ptree pt;
 	read_json(ss,pt);
-	m_Id = pt.get("Id", 0);
+	m_Id = pt.get("Id", 0L);
 	m_Username = pt.get("Username", "");
 	m_FirstName = pt.get("FirstName", "");
 	m_LastName = pt.get("LastName", "");