moved packages to address collisions with swagger-core per #145

2014-05-14 18:23:32 -04:00
parent b4f3143c8c
commit 58b985ba02
43 changed files with 63 additions and 63 deletions
--- a/build.sbt
+++ b/build.sbt
@@ -5,7 +5,7 @@ organization := "com.wordnik"

 name := "swagger-codegen"

-version := "2.0.14"
+version := "2.0.16"

 scalaVersion := "2.10.0"

--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8")
+addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.2")

 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.9.1")
--- a/src/main/resources/flash/build.xml
+++ b/src/main/resources/flash/build.xml
@@ -63,7 +63,7 @@
            <arg line="-source-path ${sourcepath}"/>
            <arg line="-footer 'Copyright Wordnik'"/>
            <arg line="-package com.wordnik.swagger.api 'Contains the apis which are used by clients to make calls to the services deployed'"/>
-            <arg line="-package com.wordnik.swagger.model 'Contains common classes which encapsulate data elements required'"/>
+            <arg line="-package com.wordnik.swagger.codegen.model 'Contains common classes which encapsulate data elements required'"/>
            <arg line="-package com.wordnik.swagger.common 'Contains classes which are used by the api classes to invoke the deployed api like SwaggerApi - a base class, ApiUserCredentials, etc.'"/>
            <arg line="-package com.wordnik.swagger.event 'Results of calls made to Wordnik are returned via dispatched events. This package contains such event classes. Right now thats just ApiClientEvent and Response.'"/>
            <arg line="-package com.wordnik.swagger.exception 'Contains classes that encapsulate the errors generated'"/>
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicAndroidJavaClient.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicAndroidJavaClient.scala
@@ -18,7 +18,7 @@ package com.wordnik.swagger.codegen

 import com.wordnik.swagger.codegen.BasicJavaGenerator

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 object BasicAndroidJavaClient extends BasicAndroidJavaGenerator {
  def main(args: Array[String]) = generateClient(args)
@@ -53,10 +53,10 @@ class BasicAndroidJavaGenerator extends BasicJavaGenerator {
  override def destinationDir = "generated-code/android-java/src/main/java"

  // package for models
-  override def modelPackage = Some("com.wordnik.client.model")
+  override def modelPackage: Option[String] = Some("com.wordnik.client.model")

  // package for api classes
-  override def apiPackage = Some("com.wordnik.client.api")
+  override def apiPackage: Option[String] = Some("com.wordnik.client.api")

  /**
   * you should override these params for generating the pom.xml and processing
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicCSharpGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicCSharpGenerator.scala
@@ -16,7 +16,7 @@

 package com.wordnik.swagger.codegen

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 object BasicCSharpGenerator extends BasicCSharpGenerator {
  def main(args: Array[String]) = generateClient(args)
@@ -79,10 +79,10 @@ class BasicCSharpGenerator extends BasicGenerator {
  override def importMapping = Map()

  // package for models
-  override def modelPackage = Some("Com.Wordnik.Client.Model")
+  override def modelPackage: Option[String] = Some("Com.Wordnik.Client.Model")

  // package for api classes
-  override def apiPackage = Some("Com.Wordnik.Client.Api")
+  override def apiPackage: Option[String] = Some("Com.Wordnik.Client.Api")

  // file suffix
  override def fileSuffix = ".cs"
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicFlashCodegen.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicFlashCodegen.scala
@@ -16,7 +16,7 @@

 package com.wordnik.swagger.codegen

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 abstract class BasicFlashCodegen extends BasicGenerator {
  override def defaultIncludes = Set(
@@ -53,10 +53,10 @@ abstract class BasicFlashCodegen extends BasicGenerator {


  // package for models
-  override def modelPackage = Some("com.wordnik.client.model")
+  override def modelPackage: Option[String] = Some("com.wordnik.client.model")

  // package for api classes
-  override def apiPackage = Some("com.wordnik.client.api")
+  override def apiPackage: Option[String] = Some("com.wordnik.client.api")

  // file suffix
  override def fileSuffix = ".as"
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicGenerator.scala
@@ -20,8 +20,8 @@ import com.wordnik.swagger.codegen._
 import com.wordnik.swagger.codegen.util._
 import com.wordnik.swagger.codegen.language.CodegenConfig
 import com.wordnik.swagger.codegen.spec.SwaggerSpecValidator
-import com.wordnik.swagger.model._
-import com.wordnik.swagger.model.SwaggerSerializers
+import com.wordnik.swagger.codegen.model._
+import com.wordnik.swagger.codegen.model.SwaggerSerializers
 import com.wordnik.swagger.codegen.spec.ValidationMessage

 import java.io.{ File, FileWriter }
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicGroovyGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicGroovyGenerator.scala
@@ -38,10 +38,10 @@ class BasicGroovyGenerator extends BasicJavaGenerator {


  // package for models
-  override def modelPackage = Some("com.wordnik.client.model")
+  override def modelPackage: Option[String] = Some("com.wordnik.client.model")

  // package for api classes
-  override def apiPackage = Some("com.wordnik.client.api")
+  override def apiPackage: Option[String] = Some("com.wordnik.client.api")

  // file suffix
  override def fileSuffix = ".groovy"
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala
@@ -16,7 +16,7 @@

 package com.wordnik.swagger.codegen

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 object BasicJavaGenerator extends BasicJavaGenerator {
  def main(args: Array[String]) = generateClient(args)
@@ -94,10 +94,10 @@ class BasicJavaGenerator extends BasicGenerator {
  )

  // package for models
-  override def modelPackage = Some("com.wordnik.client.model")
+  override def modelPackage: Option[String] = Some("com.wordnik.client.model")

  // package for api classes
-  override def apiPackage = Some("com.wordnik.client.api")
+  override def apiPackage: Option[String] = Some("com.wordnik.client.api")

  // file suffix
  override def fileSuffix = ".java"
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicObjcGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicObjcGenerator.scala
@@ -16,7 +16,7 @@

 package com.wordnik.swagger.codegen

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 object BasicObjcGenerator extends BasicObjcGenerator {
  def main(args: Array[String]) = generateClient(args)
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicPHPGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicPHPGenerator.scala
@@ -16,7 +16,7 @@

 package com.wordnik.swagger.codegen

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 import java.io.File

@@ -38,10 +38,10 @@ class BasicPHPGenerator extends BasicGenerator {
  override def destinationDir = "generated-code/php"

  // package for models
-  override def modelPackage = Some("models")
+  override def modelPackage: Option[String] = Some("models")

  // package for apis
-  override def apiPackage = Some("")
+  override def apiPackage: Option[String] = Some("")

  // file suffix
  override def fileSuffix = ".php"
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicPythonGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicPythonGenerator.scala
@@ -16,7 +16,7 @@

 package com.wordnik.swagger.codegen

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 import java.io.File

@@ -38,7 +38,7 @@ class BasicPythonGenerator extends BasicGenerator {
  override def destinationDir = "generated-code/python"

  // package for models
-  override def modelPackage = Some("models")
+  override def modelPackage: Option[String] = Some("models")

  // package for apis
  override def apiPackage = None
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicRubyGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicRubyGenerator.scala
@@ -16,7 +16,7 @@

 package com.wordnik.swagger.codegen

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 import java.io.File

@@ -26,7 +26,7 @@ object BasicRubyGenerator extends BasicRubyGenerator {

 class BasicRubyGenerator extends BasicGenerator {

-  override def apiPackage = Some("lib")
+  override def apiPackage: Option[String] = Some("lib")

  // location of templates
  override def templateDir = "ruby"
@@ -44,7 +44,7 @@ class BasicRubyGenerator extends BasicGenerator {
  override def fileSuffix = ".rb"

  // package for models
-  override def modelPackage = Some("models")
+  override def modelPackage: Option[String] = Some("models")

  // response classes
  override def processResponseClass(responseClass: String): Option[String] = {
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicScalaGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicScalaGenerator.scala
@@ -16,7 +16,7 @@

 package com.wordnik.swagger.codegen

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 object BasicScalaGenerator extends BasicScalaGenerator {
  def main(args: Array[String]) = generateClient(args)
@@ -114,10 +114,10 @@ class BasicScalaGenerator extends BasicGenerator {
  )

  // package for models
-  override def modelPackage = Some("com.wordnik.client.model")
+  override def modelPackage: Option[String] = Some("com.wordnik.client.model")

  // package for api classes
-  override def apiPackage = Some("com.wordnik.client.api")
+  override def apiPackage: Option[String] = Some("com.wordnik.client.api")

  // response classes--if you don't want a response class, override and set to None
  override def processResponseClass(responseClass: String): Option[String] = {
--- a/src/main/scala/com/wordnik/swagger/codegen/Codegen.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/Codegen.scala
@@ -16,7 +16,7 @@

 package com.wordnik.swagger.codegen

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.util.CoreUtils
 import com.wordnik.swagger.codegen.language.CodegenConfig
 import com.wordnik.swagger.codegen.spec.SwaggerSpec._
--- a/src/main/scala/com/wordnik/swagger/codegen/ScalaAsyncClientGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/ScalaAsyncClientGenerator.scala
@@ -2,7 +2,7 @@ package com.wordnik.swagger.codegen

 import scala.collection.mutable
 import java.io.{File, FileWriter}
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import scala.collection.mutable.{HashMap, ListBuffer}
 import language.CodegenConfig
 import scala.io.Source
--- a/src/main/scala/com/wordnik/swagger/codegen/SpecConverter.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/SpecConverter.scala
@@ -1,7 +1,7 @@
 package com.wordnik.swagger.codegen

 import com.wordnik.swagger.codegen.util.{ ResourceExtractor, ApiExtractor }
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 import java.io.File

--- a/src/main/scala/com/wordnik/swagger/codegen/SwaggerDocGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/SwaggerDocGenerator.scala
@@ -16,7 +16,7 @@

 import com.wordnik.swagger.codegen.BasicGenerator
 import com.wordnik.swagger.codegen.spec.SwaggerSpec
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 import scala.collection.mutable.{ HashMap, ListBuffer }

@@ -84,10 +84,10 @@ object SwaggerDocGenerator extends BasicGenerator {
  }

  // package for models
-  override def modelPackage = Some("models")
+  override def modelPackage: Option[String] = Some("models")

  // package for api classes
-  override def apiPackage = Some("operations")
+  override def apiPackage: Option[String] = Some("operations")

  override def supportingFiles = List(
    ("pom.xml", outputFolder, "pom.xml"),
--- a/src/main/scala/com/wordnik/swagger/codegen/language/CodegenConfig.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/language/CodegenConfig.scala
@@ -16,7 +16,7 @@

 package com.wordnik.swagger.codegen.language

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 import scala.collection.mutable.{ HashMap, HashSet }

--- a/src/main/scala/com/wordnik/swagger/codegen/model/AuthorizationModels.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/model/AuthorizationModels.scala
@@ -14,7 +14,7 @@
 *  limitations under the License.
 */

-package com.wordnik.swagger.model
+package com.wordnik.swagger.codegen.model

 trait AuthorizationType {
  def `type`: String
--- a/src/main/scala/com/wordnik/swagger/codegen/model/LegacySerializers.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/model/LegacySerializers.scala
@@ -1,6 +1,6 @@
-package com.wordnik.swagger.model.legacy
+package com.wordnik.swagger.codegen.model.legacy

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.spec.ValidationMessage

 import org.json4s._
--- a/src/main/scala/com/wordnik/swagger/codegen/model/SwaggerModelSerializer.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/model/SwaggerModelSerializer.scala
@@ -1,4 +1,4 @@
-package com.wordnik.swagger.model
+package com.wordnik.swagger.codegen.model

 import com.wordnik.swagger.codegen.spec.ValidationMessage
 import legacy.LegacySerializers
--- a/src/main/scala/com/wordnik/swagger/codegen/model/SwaggerModels.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/model/SwaggerModels.scala
@@ -14,7 +14,7 @@
 *  limitations under the License.
 */

-package com.wordnik.swagger.model
+package com.wordnik.swagger.codegen.model

 import scala.collection.mutable.LinkedHashMap

--- a/src/main/scala/com/wordnik/swagger/codegen/spec/SwaggerSpecValidator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/spec/SwaggerSpecValidator.scala
@@ -16,7 +16,7 @@

 package com.wordnik.swagger.codegen.spec

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.PathUtil
 import com.wordnik.swagger.codegen.spec.SwaggerSpec._
 import com.wordnik.swagger.codegen.util.CoreUtils
--- a/src/main/scala/com/wordnik/swagger/codegen/spec/Validator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/spec/Validator.scala
@@ -18,7 +18,7 @@ package com.wordnik.swagger.codegen.spec

 import com.wordnik.swagger.codegen.util.{CoreUtils, ApiExtractor, ResourceExtractor}
 import com.wordnik.swagger.codegen.PathUtil
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 import scala.collection.JavaConversions._

--- a/src/main/scala/com/wordnik/swagger/codegen/util/ApiExtractor.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/util/ApiExtractor.scala
@@ -16,7 +16,7 @@

 package com.wordnik.swagger.codegen.util

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 import org.json4s.jackson.JsonMethods._
 import org.json4s.jackson.Serialization.read
--- a/src/main/scala/com/wordnik/swagger/codegen/util/CoreUtils.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/util/CoreUtils.scala
@@ -16,7 +16,7 @@

 package com.wordnik.swagger.codegen.util

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 import scala.collection.mutable.{ HashSet, ListBuffer, HashMap }
 import scala.collection.JavaConversions._
--- a/src/main/scala/com/wordnik/swagger/codegen/util/RemoteUrl.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/util/RemoteUrl.scala
@@ -1,6 +1,6 @@
 package com.wordnik.swagger.codegen.util

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 import java.net._
 import java.io.InputStream
--- a/src/main/scala/com/wordnik/swagger/codegen/util/ResourceExtractor.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/util/ResourceExtractor.scala
@@ -16,7 +16,7 @@

 package com.wordnik.swagger.codegen.util

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 import org.json4s._
 import org.json4s.jackson.JsonMethods._
--- a/src/test/scala/BasicCSharpGeneratorTest.scala
+++ b/src/test/scala/BasicCSharpGeneratorTest.scala
@@ -14,7 +14,7 @@
 *  limitations under the License.
 */

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.{BasicCSharpGenerator, PathUtil}
 import com.wordnik.swagger.codegen.util._
 import com.wordnik.swagger.codegen.language._
--- a/src/test/scala/BasicGeneratorTest.scala
+++ b/src/test/scala/BasicGeneratorTest.scala
@@ -16,7 +16,7 @@

 import com.wordnik.swagger.codegen.BasicGenerator
 import com.wordnik.swagger.codegen.util._
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
--- a/src/test/scala/BasicJavaGeneratorTest.scala
+++ b/src/test/scala/BasicJavaGeneratorTest.scala
@@ -14,7 +14,7 @@
 *  limitations under the License.
 */

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.{BasicJavaGenerator, PathUtil}
 import com.wordnik.swagger.codegen.util._
 import com.wordnik.swagger.codegen.language._
--- a/src/test/scala/BasicScalaGeneratorTest.scala
+++ b/src/test/scala/BasicScalaGeneratorTest.scala
@@ -14,7 +14,7 @@
 *  limitations under the License.
 */

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.{BasicScalaGenerator, Codegen, PathUtil}
 import com.wordnik.swagger.codegen.util._
 import com.wordnik.swagger.codegen.language._
--- a/src/test/scala/CodegenConfigTest.scala
+++ b/src/test/scala/CodegenConfigTest.scala
@@ -39,7 +39,7 @@ class CodegenConfigTest extends FlatSpec with ShouldMatchers {
    override def escapeReservedWord(word: String) = "`" + word + "`"
    override def typeMapping = Map("int" -> "integer")
    override def invokerPackage = Some("com.wordnik.something")
-    override def apiPackage = Some("com.wordnik.api")
+    override def apiPackage: Option[String] = Some("com.wordnik.api")
    override def modelPackage = Some("com.wordnik.models")
    override def reservedWords = Set("special")
    override def importMapping = super.importMapping ++ Map("User" -> "com.mypackage.User")
--- a/src/test/scala/swaggerSpec1_1/CoreUtilsTest.scala
+++ b/src/test/scala/swaggerSpec1_1/CoreUtilsTest.scala
@@ -2,7 +2,7 @@ package swaggerSpec1_1

 import com.wordnik.swagger.codegen.util.CoreUtils

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.util._

 import org.junit.runner.RunWith
--- a/src/test/scala/swaggerSpec1_1/ModelSerializerValidations.scala
+++ b/src/test/scala/swaggerSpec1_1/ModelSerializerValidations.scala
@@ -1,6 +1,6 @@
 package swaggerSpec1_1

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 import org.json4s._
 import org.json4s.JsonDSL._
--- a/src/test/scala/swaggerSpec1_1/ModelSerializersTest.scala
+++ b/src/test/scala/swaggerSpec1_1/ModelSerializersTest.scala
@@ -1,6 +1,6 @@
 package swaggerSpec1_1

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 import org.json4s._
 import org.json4s.JsonDSL._
--- a/src/test/scala/swaggerSpec1_1/SwaggerModelTest.scala
+++ b/src/test/scala/swaggerSpec1_1/SwaggerModelTest.scala
@@ -15,7 +15,7 @@
 */
 package swaggerSpec1_1

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 import org.json4s.jackson.JsonMethods._
 import org.json4s.jackson.Serialization.read
--- a/src/test/scala/swaggerSpec1_1/UtilsTest.scala
+++ b/src/test/scala/swaggerSpec1_1/UtilsTest.scala
@@ -15,7 +15,7 @@
 */
 package swaggerSpec1_1

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.util.{ResourceExtractor, ApiExtractor, CoreUtils}

 import org.junit.runner.RunWith
--- a/src/test/scala/swaggerSpec1_2/CoreUtilsTest.scala
+++ b/src/test/scala/swaggerSpec1_2/CoreUtilsTest.scala
@@ -2,7 +2,7 @@ package swaggerSpec1_2

 import com.wordnik.swagger.codegen.util.CoreUtils

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.util._

 import org.junit.runner.RunWith
--- a/src/test/scala/swaggerSpec1_2/ModelSerializerValidations.scala
+++ b/src/test/scala/swaggerSpec1_2/ModelSerializerValidations.scala
@@ -1,6 +1,6 @@
 package swaggerSpec1_2

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 import org.json4s._
 import org.json4s.JsonDSL._
--- a/src/test/scala/swaggerSpec1_2/ModelSerializersTest.scala
+++ b/src/test/scala/swaggerSpec1_2/ModelSerializersTest.scala
@@ -1,6 +1,6 @@
 package swaggerSpec1_2

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._

 import org.json4s._
 import org.json4s.JsonDSL._
--- a/src/test/scala/swaggerSpec1_2/UtilsTest.scala
+++ b/src/test/scala/swaggerSpec1_2/UtilsTest.scala
@@ -15,7 +15,7 @@
 */
 package swaggerSpec1_2

-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.util.{ResourceExtractor, ApiExtractor, CoreUtils}

 import org.junit.runner.RunWith