File tree Expand file tree Collapse file tree 2 files changed +8
-9
lines changed
src/main/scala/com/wordnik/swagger/codegen Expand file tree Collapse file tree 2 files changed +8
-9
lines changed Original file line number Diff line number Diff line change @@ -102,7 +102,7 @@ class BasicCSharpGenerator extends BasicGenerator {
102
102
val ComplexTypeMatcher = " (.*)\\ [(.*)\\ ].*" .r
103
103
val t = e match {
104
104
case ComplexTypeMatcher (container, inner) => {
105
- e.replaceAll(container, typeMapping.getOrElse(container, container))
105
+ e.replaceAll(container, typeMapping.getOrElse(container.toLowerCase , container))
106
106
}
107
107
case _ => e
108
108
}
@@ -126,8 +126,8 @@ class BasicCSharpGenerator extends BasicGenerator {
126
126
override def toDeclaration (obj : ModelProperty ) = {
127
127
var declaredType = toDeclaredType(obj.`type`)
128
128
129
- declaredType match {
130
- case " Array " => declaredType = " List"
129
+ declaredType.toLowerCase match {
130
+ case " array " => declaredType = " List"
131
131
case e : String => e
132
132
}
133
133
Original file line number Diff line number Diff line change @@ -497,12 +497,11 @@ class Codegen(config: CodegenConfig) {
497
497
case true => properties += " isPrimitiveType" -> " true"
498
498
case _ => properties += " complexType" -> config.toModelName(baseType)
499
499
}
500
-
501
500
l += properties
502
501
})
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" )
506
505
}
507
506
data += " vars" -> l
508
507
data += " imports" -> imports.toSet
@@ -557,11 +556,11 @@ class Codegen(config: CodegenConfig) {
557
556
" model" -> modelToMap(m._1, m._2),
558
557
" filename" -> config.toModelFilename(m._1),
559
558
" modelJson" -> json,
560
- " hasMore " -> " true" )
559
+ " hasMoreModels " -> " true" )
561
560
})
562
561
modelList.size match {
563
562
case 0 =>
564
- case _ => modelList.last.asInstanceOf [HashMap [String , String ]] -= " hasMore "
563
+ case _ => modelList.last.asInstanceOf [HashMap [String , String ]] -= " hasMoreModels "
565
564
}
566
565
567
566
val data : HashMap [String , AnyRef ] =
You can’t perform that action at this time.
0 commit comments