Skip to content

Commit 5a3426d

Browse files
committed
renamed to use SWG as default prefix
1 parent b6b28bb commit 5a3426d

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

src/main/scala/com/wordnik/swagger/codegen/BasicObjcGenerator.scala

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ class BasicObjcGenerator extends BasicGenerator {
4545
"NSString")
4646

4747
override def typeMapping = Map(
48-
"Date" -> "NIKDate",
48+
"enum" -> "NSString",
49+
"date" -> "SWGDate",
50+
"Date" -> "SWGDate",
4951
"boolean" -> "NSNumber",
5052
"string" -> "NSString",
5153
"integer" -> "NSNumber",
@@ -59,10 +61,9 @@ class BasicObjcGenerator extends BasicGenerator {
5961
"object" -> "NSObject")
6062

6163
override def importMapping = Map(
62-
"RVBDate" -> "NIKDate",
63-
"Date" -> "NIKDate")
64+
"Date" -> "SWGDate")
6465

65-
override def toModelFilename(name: String) = "RVB" + name
66+
override def toModelFilename(name: String) = "SWG" + name
6667

6768
// naming for the models
6869
override def toModelName(name: String) = {
@@ -74,16 +75,24 @@ class BasicObjcGenerator extends BasicGenerator {
7475
).toSet.contains(name) match {
7576
case true => name(0).toUpper + name.substring(1)
7677
case _ => {
77-
"RVB" + name(0).toUpper + name.substring(1)
78+
"SWG" + name(0).toUpper + name.substring(1)
7879
}
7980
}
8081
}
8182

83+
// objective c doesn't like variables starting with "new"
84+
override def toVarName(name: String): String = {
85+
if(name.startsWith("new") || reservedWords.contains(name)) {
86+
escapeReservedWord(name)
87+
}
88+
else name
89+
}
90+
8291
// naming for the apis
83-
override def toApiName(name: String) = "RVB" + name(0).toUpper + name.substring(1) + "Api"
92+
override def toApiName(name: String) = "SWG" + name(0).toUpper + name.substring(1) + "Api"
8493

8594
// location of templates
86-
override def templateDir = "src/main/resources/objc"
95+
override def templateDir = "objc"
8796

8897
// template used for models
8998
modelTemplateFiles += "model-header.mustache" -> ".h"
@@ -110,7 +119,6 @@ class BasicObjcGenerator extends BasicGenerator {
110119
responseClass match {
111120
case "void" => None
112121
case e: String => {
113-
println(responseClass)
114122
if(responseClass.toLowerCase.startsWith("array") || responseClass.toLowerCase.startsWith("list"))
115123
Some("NSArray")
116124
else
@@ -162,7 +170,6 @@ class BasicObjcGenerator extends BasicGenerator {
162170
}
163171

164172
override def toDeclaration(obj: ModelProperty) = {
165-
println("getting declaration for " + obj)
166173
var declaredType = toDeclaredType(obj.`type`)
167174
declaredType.toLowerCase match {
168175
case "list" => {

0 commit comments

Comments
 (0)