From 36f4239c936dd408adb97c5fa8b258ec609c7536 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Fri, 5 Oct 2012 21:08:55 -0700 Subject: [PATCH] removed old refs --- .../petstore/java/JavaPetstoreCodegen.scala | 4 +- .../java/JavaWordnikApiCodegen.scala | 4 +- .../wordnik/swagger/model/SwaggerModels.scala | 82 +++++++++---------- 3 files changed, 43 insertions(+), 47 deletions(-) diff --git a/samples/client/petstore/java/JavaPetstoreCodegen.scala b/samples/client/petstore/java/JavaPetstoreCodegen.scala index c3baac257df..efeb1e67a64 100644 --- a/samples/client/petstore/java/JavaPetstoreCodegen.scala +++ b/samples/client/petstore/java/JavaPetstoreCodegen.scala @@ -16,8 +16,6 @@ import com.wordnik.swagger.codegen.BasicJavaGenerator -import com.wordnik.swagger.core._ - object JavaPetstoreCodegen extends BasicJavaGenerator { def main(args: Array[String]) = generateClient(args) @@ -42,4 +40,4 @@ object JavaPetstoreCodegen extends BasicJavaGenerator { ("apiInvoker.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replaceAll("\\.", java.io.File.separator) + java.io.File.separator, "ApiInvoker.java"), ("apiException.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replaceAll("\\.", java.io.File.separator) + java.io.File.separator, "ApiException.java"), ("pom.mustache", "samples/client/petstore/java", "pom.xml")) -} \ No newline at end of file +} diff --git a/samples/client/wordnik-api/java/JavaWordnikApiCodegen.scala b/samples/client/wordnik-api/java/JavaWordnikApiCodegen.scala index 4e102b21854..20231bd0598 100644 --- a/samples/client/wordnik-api/java/JavaWordnikApiCodegen.scala +++ b/samples/client/wordnik-api/java/JavaWordnikApiCodegen.scala @@ -16,8 +16,6 @@ import com.wordnik.swagger.codegen.BasicJavaGenerator -import com.wordnik.swagger.core._ - object JavaWordnikApiCodegen extends BasicJavaGenerator { def main(args: Array[String]) = generateClient(args) @@ -44,4 +42,4 @@ object JavaWordnikApiCodegen extends BasicJavaGenerator { ("apiInvoker.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replaceAll("\\.", java.io.File.separator) + java.io.File.separator, "ApiInvoker.java"), ("apiException.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replaceAll("\\.", java.io.File.separator) + java.io.File.separator, "ApiException.java"), ("pom.mustache", destinationRoot, "pom.xml")) -} \ No newline at end of file +} diff --git a/src/main/scala/com/wordnik/swagger/model/SwaggerModels.scala b/src/main/scala/com/wordnik/swagger/model/SwaggerModels.scala index 8da12f99e74..15394d00398 100644 --- a/src/main/scala/com/wordnik/swagger/model/SwaggerModels.scala +++ b/src/main/scala/com/wordnik/swagger/model/SwaggerModels.scala @@ -19,70 +19,70 @@ package com.wordnik.swagger.model import com.fasterxml.jackson.annotation.{JsonProperty, JsonIgnore} case class ResourceListing( - apiVersion: String, - swaggerVersion: String, - basePath: String, - apis: List[ApiListingReference] = List()) + apiVersion: String, + swaggerVersion: String, + basePath: String, + apis: List[ApiListingReference] = List()) case class ApiListingReference(path:String, description: String) case object Any extends AllowableValues case class AllowableListValues (values: List[String] = List(), valueType: String = "LIST") extends AllowableValues -case class AllowableRangeValues(min: Int, max: Int) extends AllowableValues +case class AllowableRangeValues(min: String, max: String) extends AllowableValues // using java.util.Map because Jackon 2 isn't deserializing ListMap correctly, and ordered // insertion is required case class Model( - var id: String, - var name: String, + var id: String, + var name: String, var properties: java.util.Map[String, ModelProperty], description: Option[String] = None) case class ModelProperty( - var `type`: String, - required: Boolean = false, - description: Option[String] = None, - allowableValues: AllowableValues = Any, - var items: Option[ModelRef] = None) + var `type`: String, + required: Boolean = false, + description: Option[String] = None, + allowableValues: AllowableValues = Any, + var items: Option[ModelRef] = None) case class ModelRef( - @JsonProperty("$ref") ref: String = null, - `type`: String = null) + @JsonProperty("$ref") ref: String = null, + `type`: String = null) case class ApiListing ( - apiVersion: String, - swaggerVersion: String, - basePath: String, - var resourcePath: String, - apis: List[ApiDescription] = List(), - models: Map[String, Model] = Map()) + apiVersion: String, + swaggerVersion: String, + basePath: String, + var resourcePath: String, + apis: List[ApiDescription] = List(), + models: Map[String, Model] = Map()) case class ApiDescription ( - path: String, - description: String, - operations: List[Operation] = List()) + path: String, + description: String, + operations: List[Operation] = List()) case class Operation ( - httpMethod: String, - summary: String, - notes: String, - var responseClass: String, - nickname: String, - parameters: List[Parameter] = List.empty, - errorResponses: List[ErrorResponse] = List.empty, - `deprecated`: Option[String] = None) + httpMethod: String, + summary: String, + notes: String, + var responseClass: String, + nickname: String, + parameters: List[Parameter] = List.empty, + errorResponses: List[ErrorResponse] = List.empty, + `deprecated`: Option[String] = None) case class Parameter ( - name: String, - description: String, - defaultValue: String, - required: Boolean, - allowMultiple: Boolean, - var dataType: String, - allowableValues: AllowableValues = Any, - paramType: String) + name: String, + description: String, + defaultValue: String, + required: Boolean, + allowMultiple: Boolean, + var dataType: String, + allowableValues: AllowableValues = Any, + paramType: String) case class ErrorResponse ( - code: Int, - reason: String) + code: Int, + reason: String)