adjust code

vvkeep · vvkeep · commit 213296d6b8b2 · 2022-05-08T22:48:34.000+08:00
diff --git a/JSONConverter/Classes/Builder/BuilderProtocol.swift b/JSONConverter/Classes/Builder/BuilderProtocol.swift
@@ -17,7 +17,7 @@ protocol BuilderProtocol {
     func propertySetterText(_ type: PropertyType, keyName: String, strategy: PropertyStrategy, keyTypeName: String?) -> String
     
     func contentParentClassText(_ clsText: String?) -> String
-    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String
+    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String
 
     func fileSuffix() -> String
     func fileImplSuffix() -> String
diff --git a/JSONConverter/Classes/Builder/CodableBuilder.swift b/JSONConverter/Classes/Builder/CodableBuilder.swift
@@ -48,12 +48,12 @@ class CodableBuilder: BuilderProtocol {
        return StringUtils.isEmpty(clsText) ? ": Codable" : ": \(clsText!)"
     }
     
-    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String {
+    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String {
         if structType == .class {
             return "\nclass \(clsName)\(parentClsName) {\n\(propertiesText)\n\trequired init() {}\n}\n"
         } else {
-            propertiesText.removeLastChar()
-            return "\nstruct \(clsName)\(parentClsName) {\n\(propertiesText)\n}\n"
+            let tempPropertiesText = StringUtils.removeLastChar(propertiesText)
+            return "\nstruct \(clsName)\(parentClsName) {\n\(tempPropertiesText)\n}\n"
         }
     }
     
diff --git a/JSONConverter/Classes/Builder/FlutterBuilder.swift b/JSONConverter/Classes/Builder/FlutterBuilder.swift
@@ -45,7 +45,7 @@ class FlutterBuilder: BuilderProtocol {
         return StringUtils.isEmpty(clsText) ? " extends Object" : " extends \(clsText!)"
     }
     
-    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String {
+    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String {
         return "\n@JsonSerializable()\nclass \(clsName)\(parentClsName) {\n\(propertiesText)\n\t\(clsName)(\(propertiesInitText!));\n\n\tfactory \(clsName).fromJson(Map<String, dynamic> srcJson) => _$\(clsName)FromJson(srcJson);\n\n\tMap<String, dynamic> toJson() => _$\(clsName)ToJson(this);\n\n}\n"
     }
     
diff --git a/JSONConverter/Classes/Builder/GolangBuilder.swift b/JSONConverter/Classes/Builder/GolangBuilder.swift
@@ -49,9 +49,9 @@ class GolangBuilder: BuilderProtocol {
         return StringUtils.isEmpty(clsText) ? "" : ": \(clsText!)"
     }
     
-    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String {
-        propertiesText.removeLastChar()
-        return "\ntype \(clsName) struct {\n\(propertiesText)\n}\n"
+    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String {
+        let tempPropertiesText = StringUtils.removeLastChar(propertiesText)
+        return "\ntype \(clsName) struct {\n\(tempPropertiesText)\n}\n"
     }
     
     func fileSuffix() -> String {
diff --git a/JSONConverter/Classes/Builder/HandyJSONBuilder.swift b/JSONConverter/Classes/Builder/HandyJSONBuilder.swift
@@ -48,12 +48,12 @@ class HandyJSONBuilder: BuilderProtocol {
         return StringUtils.isEmpty(clsText) ? ": HandyJSON" : ": \(clsText!)"
     }
     
-    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String {
+    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String {
         if structType == .class {
             return "\nclass \(clsName)\(parentClsName) {\n\(propertiesText)\n\trequired init() {}\n}\n"
         } else {
-            propertiesText.removeLastChar()
-            return "\nstruct \(clsName)\(parentClsName) {\n\(propertiesText)\n}\n"
+            let tempPropertiesText = StringUtils.removeLastChar(propertiesText)
+            return "\nstruct \(clsName)\(parentClsName) {\n\(tempPropertiesText)\n}\n"
         }
     }
     
diff --git a/JSONConverter/Classes/Builder/JavaBuilder.swift b/JSONConverter/Classes/Builder/JavaBuilder.swift
@@ -210,17 +210,20 @@ class JavaBuilder: BuilderProtocol {
         }
     }
     
-    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String {
+    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String {
         assert(propertiesGetterSetterText != nil, "property getter setter text can't be nil")
-        if let getterSetterText = propertiesGetterSetterText, StringUtils.isNotEmpty(getterSetterText) {
-            let range = getterSetterText.index(getterSetterText.endIndex, offsetBy: -2)..<getterSetterText.endIndex
-            propertiesGetterSetterText?.removeSubrange(range)
+        
+        var getterSetterText = propertiesGetterSetterText ?? ""
+        if var tempGetterSetterText = propertiesGetterSetterText, StringUtils.isNotEmpty(tempGetterSetterText) {
+            let range = tempGetterSetterText.index(tempGetterSetterText.endIndex, offsetBy: -2)..<tempGetterSetterText.endIndex
+            tempGetterSetterText.removeSubrange(range)
+            getterSetterText = tempGetterSetterText
         }
         
         return """
             \npublic class \(clsName) \(parentClsName) {
             \(propertiesText)
-            \(propertiesGetterSetterText!)
+            \(getterSetterText)
             }\n
             """
     }
diff --git a/JSONConverter/Classes/Builder/KakaJSONBuilder.swift b/JSONConverter/Classes/Builder/KakaJSONBuilder.swift
@@ -48,12 +48,12 @@ class KakaJSONBuilder: BuilderProtocol {
         return StringUtils.isEmpty(clsText) ? ": Convertible" : ": \(clsText!)"
     }
     
-    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String {
+    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String {
         if structType == .class {
             return "\nclass \(clsName)\(parentClsName) {\n\(propertiesText)\n\trequired init() {}\n}\n"
         } else {
-            propertiesText.removeLastChar()
-            return "\nstruct \(clsName)\(parentClsName) {\n\(propertiesText)\n}\n"
+            let tempPropertiesText = StringUtils.removeLastChar(propertiesText)
+            return "\nstruct \(clsName)\(parentClsName) {\n\(tempPropertiesText)\n}\n"
         }
     }
     
diff --git a/JSONConverter/Classes/Builder/ObjCBuilder.swift b/JSONConverter/Classes/Builder/ObjCBuilder.swift
@@ -47,9 +47,9 @@ class ObjCBuilder: BuilderProtocol {
        return StringUtils.isEmpty(clsText) ? ": NSObject" : ": \(clsText!)"
     }
     
-    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String {
-        propertiesText.removeLastChar()
-        return "\n@interface \(clsName)\(parentClsName)\n\(propertiesText)\n@end\n"
+    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String {
+        let tempPropertiesText = StringUtils.removeLastChar(propertiesText)
+        return "\n@interface \(clsName)\(parentClsName)\n\(tempPropertiesText)\n@end\n"
     }
     
     func fileSuffix() -> String {
diff --git a/JSONConverter/Classes/Builder/ObjectMapperBuilder.swift b/JSONConverter/Classes/Builder/ObjectMapperBuilder.swift
@@ -45,7 +45,7 @@ class ObjectMapperBuilder: BuilderProtocol {
         }
     }
     
-    func initPropertyText(_ type: PropertyType, keyName: String, strategy: PropertyStrategy, maxKeyNameLength: Int, typeName: String?) -> String {
+    func propertyInitText(_ type: PropertyType, keyName: String, strategy: PropertyStrategy, maxKeyNameLength: Int, keyTypeName: String?) -> String {
         let tempKeyName = strategy.processed(keyName)
         let spaceText = String.numSpace(count: maxKeyNameLength - tempKeyName.count)
         return "\t\t\(tempKeyName)\(spaceText) <- map[\"\(keyName)\"]\n"
@@ -55,7 +55,7 @@ class ObjectMapperBuilder: BuilderProtocol {
         return StringUtils.isEmpty(clsText) ? ": Mappable" : ": \(clsText!)"
     }
     
-    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String {
+    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String {
         if structType == .class {
             return "\nclass \(clsName)\(parentClsName) {\n\(propertiesText)\n\trequired init?(map: Map) {}\n\n\tfunc mapping(map: Map) {\n\(propertiesInitText!)\t}\n}\n"
         } else {
diff --git a/JSONConverter/Classes/Builder/SwiftBuilder.swift b/JSONConverter/Classes/Builder/SwiftBuilder.swift
@@ -47,12 +47,12 @@ class SwiftBuilder: BuilderProtocol {
         return StringUtils.isEmpty(clsText) ? "" : ": \(clsText!)"
     }
     
-    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String {
-        propertiesText.removeLastChar()
+    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String {
+        let tempPropertiesText = StringUtils.removeLastChar(propertiesText)
         if structType == .class {
-            return "\nclass \(clsName)\(parentClsName) {\n\(propertiesText)\n}\n"
+            return "\nclass \(clsName)\(parentClsName) {\n\(tempPropertiesText)\n}\n"
         } else {
-            return "\nstruct \(clsName)\(parentClsName) {\n\(propertiesText)\n}\n"
+            return "\nstruct \(clsName)\(parentClsName) {\n\(tempPropertiesText)\n}\n"
         }
     }
     
diff --git a/JSONConverter/Classes/Builder/SwiftyJSONBuilder.swift b/JSONConverter/Classes/Builder/SwiftyJSONBuilder.swift
@@ -79,7 +79,7 @@ class SwiftyJSONBuilder: BuilderProtocol {
         return StringUtils.isEmpty(clsText) ? "" : ": \(clsText!)"
     }
     
-    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String {
+    func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String {
         if structType == .class {
             return "\nclass \(clsName)\(parentClsName) {\n\(propertiesText)\n\tinit(json: JSON) {\n\(propertiesInitText!)\t}\n}\n"
         } else {
diff --git a/JSONConverter/Classes/Common/Utils/StringUtils.swift b/JSONConverter/Classes/Common/Utils/StringUtils.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 class StringUtils {
-    class func isEmpty(_ string: String?) -> Bool {
+    static func isEmpty(_ string: String?) -> Bool {
         if let string = string,
             string.trimmingCharacters(in: .whitespacesAndNewlines).count > 0 {
             return false
@@ -18,7 +18,17 @@ class StringUtils {
         }
     }
     
-    class func isNotEmpty(_ string: String?) -> Bool {
+    static func isNotEmpty(_ string: String?) -> Bool {
         return !isEmpty(string)
     }
+    
+    static func removeLastChar(_ string: String) -> String {
+        var temp = string
+        if isNotEmpty(temp) {
+            let range = temp.index(temp.endIndex, offsetBy: -1)..<temp.endIndex
+            temp.removeSubrange(range)
+        }
+        
+        return temp
+    }
 }
diff --git a/JSONConverter/Classes/Model/Content.swift b/JSONConverter/Classes/Model/Content.swift
@@ -46,12 +46,12 @@ class Content {
     
     func toString() -> String {
         properties.sort { $0 < $1 }
-        var propertiesText = allPropertyString()
-        var propertiesInitText: String? = allPropertyInitString()
+        let propertiesText = allPropertyString()
+        let propertiesInitText: String? = allPropertyInitString()
         let parentClsName = builder.contentParentClassText(self.parentClsName)
-        var propertiesGetterSetterText: String? = allGetterSetterString()
+        let propertiesGetterSetterText: String? = allGetterSetterString()
         
-        let contentText = builder.contentText(langStruct.structType, clsName: className, parentClsName: parentClsName, propertiesText: &propertiesText, propertiesInitText: &propertiesInitText, propertiesGetterSetterText: &propertiesGetterSetterText)
+        let contentText = builder.contentText(langStruct.structType, clsName: className, parentClsName: parentClsName, propertiesText: propertiesText, propertiesInitText: propertiesInitText, propertiesGetterSetterText: propertiesGetterSetterText)
         return contentText
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,12 @@ class CodableBuilder: BuilderProtocol {`
`48`	`48`	`return StringUtils.isEmpty(clsText) ? ": Codable" : ": \(clsText!)"`
`49`	`49`	`}`
`50`	`50`
`51`		`- func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String {`
	`51`	`+ func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String {`
`52`	`52`	`if structType == .class {`
`53`	`53`	`return "\nclass \(clsName)\(parentClsName) {\n\(propertiesText)\n\trequired init() {}\n}\n"`
`54`	`54`	`} else {`
`55`		`- propertiesText.removeLastChar()`
`56`		`- return "\nstruct \(clsName)\(parentClsName) {\n\(propertiesText)\n}\n"`
	`55`	`+ let tempPropertiesText = StringUtils.removeLastChar(propertiesText)`
	`56`	`+ return "\nstruct \(clsName)\(parentClsName) {\n\(tempPropertiesText)\n}\n"`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class FlutterBuilder: BuilderProtocol {`
`45`	`45`	`return StringUtils.isEmpty(clsText) ? " extends Object" : " extends \(clsText!)"`
`46`	`46`	`}`
`47`	`47`
`48`		`- func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String {`
	`48`	`+ func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String {`
`49`	`49`	`return "\n@JsonSerializable()\nclass \(clsName)\(parentClsName) {\n\(propertiesText)\n\t\(clsName)(\(propertiesInitText!));\n\n\tfactory \(clsName).fromJson(Map<String, dynamic> srcJson) => _$\(clsName)FromJson(srcJson);\n\n\tMap<String, dynamic> toJson() => _$\(clsName)ToJson(this);\n\n}\n"`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,9 @@ class GolangBuilder: BuilderProtocol {`
`49`	`49`	`return StringUtils.isEmpty(clsText) ? "" : ": \(clsText!)"`
`50`	`50`	`}`
`51`	`51`
`52`		`- func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String {`
`53`		`- propertiesText.removeLastChar()`
`54`		`- return "\ntype \(clsName) struct {\n\(propertiesText)\n}\n"`
	`52`	`+ func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String {`
	`53`	`+ let tempPropertiesText = StringUtils.removeLastChar(propertiesText)`
	`54`	`+ return "\ntype \(clsName) struct {\n\(tempPropertiesText)\n}\n"`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`func fileSuffix() -> String {`
Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,12 @@ class HandyJSONBuilder: BuilderProtocol {`
`48`	`48`	`return StringUtils.isEmpty(clsText) ? ": HandyJSON" : ": \(clsText!)"`
`49`	`49`	`}`
`50`	`50`
`51`		`- func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String {`
	`51`	`+ func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String {`
`52`	`52`	`if structType == .class {`
`53`	`53`	`return "\nclass \(clsName)\(parentClsName) {\n\(propertiesText)\n\trequired init() {}\n}\n"`
`54`	`54`	`} else {`
`55`		`- propertiesText.removeLastChar()`
`56`		`- return "\nstruct \(clsName)\(parentClsName) {\n\(propertiesText)\n}\n"`
	`55`	`+ let tempPropertiesText = StringUtils.removeLastChar(propertiesText)`
	`56`	`+ return "\nstruct \(clsName)\(parentClsName) {\n\(tempPropertiesText)\n}\n"`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -210,17 +210,20 @@ class JavaBuilder: BuilderProtocol {`
`210`	`210`	`}`
`211`	`211`	`}`
`212`	`212`
`213`		`- func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String {`
	`213`	`+ func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String {`
`214`	`214`	`assert(propertiesGetterSetterText != nil, "property getter setter text can't be nil")`
`215`		`- if let getterSetterText = propertiesGetterSetterText, StringUtils.isNotEmpty(getterSetterText) {`
`216`		`- let range = getterSetterText.index(getterSetterText.endIndex, offsetBy: -2)..<getterSetterText.endIndex`
`217`		`- propertiesGetterSetterText?.removeSubrange(range)`
	`215`	`+`
	`216`	`+ var getterSetterText = propertiesGetterSetterText ?? ""`
	`217`	`+ if var tempGetterSetterText = propertiesGetterSetterText, StringUtils.isNotEmpty(tempGetterSetterText) {`
	`218`	`+ let range = tempGetterSetterText.index(tempGetterSetterText.endIndex, offsetBy: -2)..<tempGetterSetterText.endIndex`
	`219`	`+ tempGetterSetterText.removeSubrange(range)`
	`220`	`+ getterSetterText = tempGetterSetterText`
`218`	`221`	`}`
`219`	`222`
`220`	`223`	`return """`
`221`	`224`	`\npublic class \(clsName) \(parentClsName) {`
`222`	`225`	`\(propertiesText)`
`223`		`- \(propertiesGetterSetterText!)`
	`226`	`+ \(getterSetterText)`
`224`	`227`	`}\n`
`225`	`228`	`"""`
`226`	`229`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,12 @@ class KakaJSONBuilder: BuilderProtocol {`
`48`	`48`	`return StringUtils.isEmpty(clsText) ? ": Convertible" : ": \(clsText!)"`
`49`	`49`	`}`
`50`	`50`
`51`		`- func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String {`
	`51`	`+ func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String {`
`52`	`52`	`if structType == .class {`
`53`	`53`	`return "\nclass \(clsName)\(parentClsName) {\n\(propertiesText)\n\trequired init() {}\n}\n"`
`54`	`54`	`} else {`
`55`		`- propertiesText.removeLastChar()`
`56`		`- return "\nstruct \(clsName)\(parentClsName) {\n\(propertiesText)\n}\n"`
	`55`	`+ let tempPropertiesText = StringUtils.removeLastChar(propertiesText)`
	`56`	`+ return "\nstruct \(clsName)\(parentClsName) {\n\(tempPropertiesText)\n}\n"`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,9 @@ class ObjCBuilder: BuilderProtocol {`
`47`	`47`	`return StringUtils.isEmpty(clsText) ? ": NSObject" : ": \(clsText!)"`
`48`	`48`	`}`
`49`	`49`
`50`		`- func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String {`
`51`		`- propertiesText.removeLastChar()`
`52`		`- return "\n@interface \(clsName)\(parentClsName)\n\(propertiesText)\n@end\n"`
	`50`	`+ func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String {`
	`51`	`+ let tempPropertiesText = StringUtils.removeLastChar(propertiesText)`
	`52`	`+ return "\n@interface \(clsName)\(parentClsName)\n\(tempPropertiesText)\n@end\n"`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`func fileSuffix() -> String {`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class ObjectMapperBuilder: BuilderProtocol {`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`- func initPropertyText(_ type: PropertyType, keyName: String, strategy: PropertyStrategy, maxKeyNameLength: Int, typeName: String?) -> String {`
	`48`	`+ func propertyInitText(_ type: PropertyType, keyName: String, strategy: PropertyStrategy, maxKeyNameLength: Int, keyTypeName: String?) -> String {`
`49`	`49`	`let tempKeyName = strategy.processed(keyName)`
`50`	`50`	`let spaceText = String.numSpace(count: maxKeyNameLength - tempKeyName.count)`
`51`	`51`	`return "\t\t\(tempKeyName)\(spaceText) <- map[\"\(keyName)\"]\n"`
`@@ -55,7 +55,7 @@ class ObjectMapperBuilder: BuilderProtocol {`
`55`	`55`	`return StringUtils.isEmpty(clsText) ? ": Mappable" : ": \(clsText!)"`
`56`	`56`	`}`
`57`	`57`
`58`		`- func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String {`
	`58`	`+ func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String {`
`59`	`59`	`if structType == .class {`
`60`	`60`	`return "\nclass \(clsName)\(parentClsName) {\n\(propertiesText)\n\trequired init?(map: Map) {}\n\n\tfunc mapping(map: Map) {\n\(propertiesInitText!)\t}\n}\n"`
`61`	`61`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,12 @@ class SwiftBuilder: BuilderProtocol {`
`47`	`47`	`return StringUtils.isEmpty(clsText) ? "" : ": \(clsText!)"`
`48`	`48`	`}`
`49`	`49`
`50`		`- func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: inout String, propertiesInitText: inout String?, propertiesGetterSetterText: inout String?) -> String {`
`51`		`- propertiesText.removeLastChar()`
	`50`	`+ func contentText(_ structType: StructType, clsName: String, parentClsName: String, propertiesText: String, propertiesInitText: String?, propertiesGetterSetterText: String?) -> String {`
	`51`	`+ let tempPropertiesText = StringUtils.removeLastChar(propertiesText)`
`52`	`52`	`if structType == .class {`
`53`		`- return "\nclass \(clsName)\(parentClsName) {\n\(propertiesText)\n}\n"`
	`53`	`+ return "\nclass \(clsName)\(parentClsName) {\n\(tempPropertiesText)\n}\n"`
`54`	`54`	`} else {`
`55`		`- return "\nstruct \(clsName)\(parentClsName) {\n\(propertiesText)\n}\n"`
	`55`	`+ return "\nstruct \(clsName)\(parentClsName) {\n\(tempPropertiesText)\n}\n"`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`