Skip to content

Commit 74df3ab

Browse files
committed
fix for csharp array response type
1 parent 7715dbf commit 74df3ab

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class BasicCSharpGenerator extends BasicGenerator {
102102
val ComplexTypeMatcher = "(.*)\\[(.*)\\].*".r
103103
val t = e match {
104104
case ComplexTypeMatcher(container, inner) => {
105-
e.replaceAll(container, typeMapping.getOrElse(container, container))
105+
e.replaceAll(container, typeMapping.getOrElse(container.toLowerCase, container))
106106
}
107107
case _ => e
108108
}
@@ -126,8 +126,8 @@ class BasicCSharpGenerator extends BasicGenerator {
126126
override def toDeclaration(obj: ModelProperty) = {
127127
var declaredType = toDeclaredType(obj.`type`)
128128

129-
declaredType match {
130-
case "Array" => declaredType = "List"
129+
declaredType.toLowerCase match {
130+
case "array" => declaredType = "List"
131131
case e: String => e
132132
}
133133

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -497,12 +497,11 @@ class Codegen(config: CodegenConfig) {
497497
case true => properties += "isPrimitiveType" -> "true"
498498
case _ => properties += "complexType" -> config.toModelName(baseType)
499499
}
500-
501500
l += properties
502501
})
503-
l.size match {
504-
case 0 =>
505-
case _ => l.last.asInstanceOf[HashMap[String, String]] -= "hasMore"
502+
if(l.size > 0) {
503+
val last = l.last.asInstanceOf[HashMap[String, String]]
504+
last.remove("hasMore")
506505
}
507506
data += "vars" -> l
508507
data += "imports" -> imports.toSet
@@ -557,11 +556,11 @@ class Codegen(config: CodegenConfig) {
557556
"model" -> modelToMap(m._1, m._2),
558557
"filename" -> config.toModelFilename(m._1),
559558
"modelJson" -> json,
560-
"hasMore" -> "true")
559+
"hasMoreModels" -> "true")
561560
})
562561
modelList.size match {
563562
case 0 =>
564-
case _ => modelList.last.asInstanceOf[HashMap[String, String]] -= "hasMore"
563+
case _ => modelList.last.asInstanceOf[HashMap[String, String]] -= "hasMoreModels"
565564
}
566565

567566
val data: HashMap[String, AnyRef] =

0 commit comments

Comments
 (0)