Skip to content

Commit 13bc111

Browse files
fehguyfehguy
committed
added some logging for fatal container issues
1 parent cc0a30e commit 13bc111

9 files changed

+73
-24
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,10 @@ class BasicCSharpGenerator extends BasicGenerator {
137137
val inner = {
138138
obj.items match {
139139
case Some(items) => items.ref.getOrElse(items.`type`)
140-
case _ => throw new Exception("no inner type defined")
140+
case _ => {
141+
println("failed on " + obj)
142+
throw new Exception("no inner type defined")
143+
}
141144
}
142145
}
143146
declaredType += "<" + toDeclaredType(inner) + ">"
@@ -162,7 +165,10 @@ class BasicCSharpGenerator extends BasicGenerator {
162165
val inner = {
163166
obj.items match {
164167
case Some(items) => items.ref.getOrElse(items.`type`)
165-
case _ => throw new Exception("no inner type defined")
168+
case _ => {
169+
println("failed on " + dataType + ", " + obj)
170+
throw new Exception("no inner type defined")
171+
}
166172
}
167173
}
168174
"new ArrayList<" + toDeclaredType(inner) + ">" + "()"

‎src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,10 @@ class BasicJavaGenerator extends BasicGenerator {
144144
val inner = {
145145
obj.items match {
146146
case Some(items) => items.ref.getOrElse(items.`type`)
147-
case _ => throw new Exception("no inner type defined")
147+
case _ => {
148+
println("failed on " + declaredType + ", " + obj)
149+
throw new Exception("no inner type defined")
150+
}
148151
}
149152
}
150153
declaredType += "<" + toDeclaredType(inner) + ">"
@@ -153,7 +156,10 @@ class BasicJavaGenerator extends BasicGenerator {
153156
val inner = {
154157
obj.items match {
155158
case Some(items) => items.ref.getOrElse(items.`type`)
156-
case _ => throw new Exception("no inner type defined")
159+
case _ => {
160+
println("failed on " + declaredType + ", " + obj)
161+
throw new Exception("no inner type defined")
162+
}
157163
}
158164
}
159165
declaredType += "<" + toDeclaredType(inner) + ">"
@@ -178,7 +184,10 @@ class BasicJavaGenerator extends BasicGenerator {
178184
val inner = {
179185
obj.items match {
180186
case Some(items) => items.ref.getOrElse(items.`type`)
181-
case _ => throw new Exception("no inner type defined")
187+
case _ => {
188+
println("failed on " + dataType + ", " + obj)
189+
throw new Exception("no inner type defined")
190+
}
182191
}
183192
}
184193
"new ArrayList<" + toDeclaredType(inner) + ">" + "()"

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,10 @@ class BasicObjcGenerator extends BasicGenerator {
182182
else
183183
items.`type`
184184
}
185-
case _ => throw new Exception("no inner type defined")
185+
case _ => {
186+
println("failed on " + obj)
187+
throw new Exception("no inner type defined")
188+
}
186189
}
187190
}
188191
"NSArray"
@@ -191,7 +194,10 @@ class BasicObjcGenerator extends BasicGenerator {
191194
val inner = {
192195
obj.items match {
193196
case Some(items) => items.ref.getOrElse(items.`type`)
194-
case _ => throw new Exception("no inner type defined")
197+
case _ => {
198+
println("failed on " + obj)
199+
throw new Exception("no inner type defined")
200+
}
195201
}
196202
}
197203
"NSArray"
@@ -219,7 +225,10 @@ class BasicObjcGenerator extends BasicGenerator {
219225
else
220226
items.`type`
221227
}
222-
case _ => throw new Exception("no inner type defined")
228+
case _ => {
229+
println("failed on " + properCase + ", " + obj)
230+
throw new Exception("no inner type defined")
231+
}
223232
}
224233
}
225234
"new ArrayList<" + inner + ">" + "()"

‎src/main/scala/com/wordnik/swagger/codegen/BasicPHPGenerator.scala‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,10 @@ class BasicPHPGenerator extends BasicGenerator {
138138
val inner = {
139139
obj.items match {
140140
case Some(items) => items.ref.getOrElse(items.`type`)
141-
case _ => throw new Exception("no inner type defined")
141+
case _ => {
142+
println("failed on " + declaredType + ", " + obj)
143+
throw new Exception("no inner type defined")
144+
}
142145
}
143146
}
144147
declaredType += "[" + toDeclaredType(inner) + "]"

‎src/main/scala/com/wordnik/swagger/codegen/BasicPythonGenerator.scala‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,10 @@ class BasicPythonGenerator extends BasicGenerator {
138138
val inner = {
139139
obj.items match {
140140
case Some(items) => items.ref.getOrElse(items.`type`)
141-
case _ => throw new Exception("no inner type defined")
141+
case _ => {
142+
println("failed on " + declaredType + ", " + obj)
143+
throw new Exception("no inner type defined")
144+
}
142145
}
143146
}
144147
declaredType += "[" + toDeclaredType(inner) + "]"

‎src/main/scala/com/wordnik/swagger/codegen/BasicRubyGenerator.scala‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ class BasicRubyGenerator extends BasicGenerator {
7575
}
7676

7777
override def toDeclaration(obj: ModelProperty) = {
78-
var datatype = obj.`type`(0).toUpper + obj.`type`.substring(1)
78+
var dataType = obj.`type`(0).toUpper + obj.`type`.substring(1)
7979

80-
datatype match {
81-
case "Array" => datatype = "List"
80+
dataType match {
81+
case "Array" => dataType = "List"
8282
case e: String => e
8383
}
8484

85-
val defaultValue = toDefaultValue(datatype, obj)
86-
datatype match {
85+
val defaultValue = toDefaultValue(dataType, obj)
86+
dataType match {
8787
case "List" => {
8888
val inner = {
8989
obj.items match {
@@ -93,13 +93,17 @@ class BasicRubyGenerator extends BasicGenerator {
9393
else
9494
items.`type`
9595
}
96-
case _ => throw new Exception("no inner type defined")
97-
} }
98-
datatype = "java.util.List[" + inner + "]"
96+
case _ => {
97+
println("failed on " + dataType + ", " + obj)
98+
throw new Exception("no inner type defined")
99+
}
100+
}
101+
}
102+
dataType = "java.util.List[" + inner + "]"
99103
}
100104
case _ =>
101105
}
102-
(datatype, defaultValue)
106+
(dataType, defaultValue)
103107
}
104108

105109
// supporting classes

‎src/main/scala/com/wordnik/swagger/codegen/BasicScalaGenerator.scala‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,10 @@ class BasicScalaGenerator extends BasicGenerator {
163163
val inner = {
164164
obj.items match {
165165
case Some(items) => items.ref.getOrElse(items.`type`)
166-
case _ => throw new Exception("no inner type defined")
166+
case _ => {
167+
println("failed on " + obj)
168+
throw new Exception("no inner type defined")
169+
}
167170
}
168171
}
169172
val e = "List[%s]".format(toDeclaredType(inner))
@@ -173,7 +176,10 @@ class BasicScalaGenerator extends BasicGenerator {
173176
val inner = {
174177
obj.items match {
175178
case Some(items) => items.ref.getOrElse(items.`type`)
176-
case _ => throw new Exception("no inner type defined")
179+
case _ => {
180+
println("failed on " + obj)
181+
throw new Exception("no inner type defined")
182+
}
177183
}
178184
}
179185
val e = "List[%s]".format(toDeclaredType(inner))
@@ -183,7 +189,10 @@ class BasicScalaGenerator extends BasicGenerator {
183189
val inner = {
184190
obj.items match {
185191
case Some(items) => items.ref.getOrElse(items.`type`)
186-
case _ => throw new Exception("no inner type defined")
192+
case _ => {
193+
println("failed on " + obj)
194+
throw new Exception("no inner type defined")
195+
}
187196
}
188197
}
189198
val e = "Set[%s]".format(toDeclaredType(inner))

‎src/main/scala/com/wordnik/swagger/codegen/SwaggerDocGenerator.scala‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ object SwaggerDocGenerator extends BasicGenerator {
4141
val inner = {
4242
obj.items match {
4343
case Some(items) => items.ref.getOrElse(items.`type`)
44-
case _ => throw new Exception("no inner type defined")
44+
case _ => {
45+
println("failed on " + obj)
46+
throw new Exception("no inner type defined")
47+
}
4548
}
4649
}
4750
val e = "List[%s]" format toDeclaredType(inner)

‎src/main/scala/com/wordnik/swagger/codegen/language/CodegenConfig.scala‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,10 @@ abstract class CodegenConfig {
138138
case "double" => "0.0"
139139
case e: String if (Set("List").contains(e)) => {
140140
val inner =
141-
obj.items.map(i => i.ref.getOrElse(i.`type`)).getOrElse(throw new Exception("no inner type defined"))
141+
obj.items.map(i => i.ref.getOrElse(i.`type`)).getOrElse({
142+
println("failed on " + dataType + ", " + obj)
143+
throw new Exception("no inner type defined")
144+
})
142145
"List.empty[" + toDeclaredType(inner) + "]"
143146
}
144147
case _ => "_"

0 commit comments

Comments
 (0)