From b7dae2a846b63c994cfe2d640b2e663cde967927 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Thu, 21 Feb 2013 00:24:20 -0500 Subject: [PATCH] cleaned up compiler warnings --- .../com/wordnik/swagger/codegen/BasicFlashCodegen.scala | 1 - .../scala/com/wordnik/swagger/codegen/BasicGenerator.scala | 5 ++++- .../com/wordnik/swagger/codegen/BasicJavaGenerator.scala | 1 - .../com/wordnik/swagger/codegen/BasicObjcGenerator.scala | 1 - src/main/scala/com/wordnik/swagger/codegen/Codegen.scala | 1 - .../com/wordnik/swagger/codegen/util/ApiExtractor.scala | 2 +- .../com/wordnik/swagger/model/SwaggerModelSerializer.scala | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicFlashCodegen.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicFlashCodegen.scala index b48caa443e7..81e994af5fb 100644 --- a/src/main/scala/com/wordnik/swagger/codegen/BasicFlashCodegen.scala +++ b/src/main/scala/com/wordnik/swagger/codegen/BasicFlashCodegen.scala @@ -102,7 +102,6 @@ abstract class BasicFlashCodegen extends BasicGenerator { "Array" } else dt } - case _ => dt } typeMapping.getOrElse(declaredType, declaredType) } diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicGenerator.scala index 325cc96902a..092416fb60e 100644 --- a/src/main/scala/com/wordnik/swagger/codegen/BasicGenerator.scala +++ b/src/main/scala/com/wordnik/swagger/codegen/BasicGenerator.scala @@ -72,7 +72,10 @@ abstract class BasicGenerator extends CodegenConfig with PathUtil { SwaggerSerializers.validationMessages.foreach(msg => { println(msg) }) - exit(0) + Option(System.getProperty("skipErrors")) match { + case Some(str) => println("**** ignoring errors and continuing") + case None => sys.exit(0) + } } case 0 => } diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala index 52e6481efca..00b19468fa4 100644 --- a/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala +++ b/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala @@ -111,7 +111,6 @@ class BasicJavaGenerator extends BasicGenerator { "List" + dt.substring(n).replaceAll("\\[", "<").replaceAll("\\]", ">") else dt.replaceAll("\\[", "<").replaceAll("\\]", ">") } - case _ => dt } typeMapping.getOrElse(declaredType, declaredType) } diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicObjcGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicObjcGenerator.scala index 20a60b658dc..8dab7ccd22e 100644 --- a/src/main/scala/com/wordnik/swagger/codegen/BasicObjcGenerator.scala +++ b/src/main/scala/com/wordnik/swagger/codegen/BasicObjcGenerator.scala @@ -147,7 +147,6 @@ class BasicObjcGenerator extends BasicGenerator { val declaredType = dt.indexOf("[") match { case -1 => dt case n: Int => "NSArray" - case _ => dt } val t = typeMapping.getOrElse(declaredType, declaredType) diff --git a/src/main/scala/com/wordnik/swagger/codegen/Codegen.scala b/src/main/scala/com/wordnik/swagger/codegen/Codegen.scala index 3c6a5dc1e6f..a6d83f59e0f 100644 --- a/src/main/scala/com/wordnik/swagger/codegen/Codegen.scala +++ b/src/main/scala/com/wordnik/swagger/codegen/Codegen.scala @@ -562,7 +562,6 @@ class Codegen(config: CodegenConfig) { true } else false } - case _ => false } } } \ No newline at end of file diff --git a/src/main/scala/com/wordnik/swagger/codegen/util/ApiExtractor.scala b/src/main/scala/com/wordnik/swagger/codegen/util/ApiExtractor.scala index 4c37e06e3c6..d7d4e3149a8 100644 --- a/src/main/scala/com/wordnik/swagger/codegen/util/ApiExtractor.scala +++ b/src/main/scala/com/wordnik/swagger/codegen/util/ApiExtractor.scala @@ -47,7 +47,7 @@ object ApiExtractor extends RemoteUrl { println("WARNING! Unable to read API " + basePath + api.path) None } - case _ => None + case _ : Throwable=> None } }).flatten.toList } diff --git a/src/main/scala/com/wordnik/swagger/model/SwaggerModelSerializer.scala b/src/main/scala/com/wordnik/swagger/model/SwaggerModelSerializer.scala index 4b7f4ce0c2b..d70c5d75bee 100644 --- a/src/main/scala/com/wordnik/swagger/model/SwaggerModelSerializer.scala +++ b/src/main/scala/com/wordnik/swagger/model/SwaggerModelSerializer.scala @@ -219,7 +219,7 @@ object SwaggerSerializers { implicit val fmts: Formats = formats Parameter( (json \ "name").extractOrElse({ - !!(json, OPERATION_PARAM, "reason", "missing parameter name", ERROR) + !!(json, OPERATION_PARAM, "reason", "missing parameter name", WARNING) "" }), (json \ "description").extractOrElse({