loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Merge pull request #296 from lloydmeta/update/fix_deprecations

Browse Source 
Update deprecated method calls
This commit is contained in:
Tony Tam 2014-10-07 21:42:13 -07:00
commit 643c211d72
8 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
samples/client/petstore/scala/src/test/scala/PetApiTest.scala
View File

@ -3,15 +3,14 @@ import com.wordnik.petstore.model._
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner import org.scalatest.junit.JUnitRunner
import org.scalatest.FlatSpec import org.scalatest._
import org.scalatest.matchers.ShouldMatchers
import scala.collection.mutable.{ ListBuffer, HashMap } import scala.collection.mutable.{ ListBuffer, HashMap }
import scala.collection.JavaConverters._ import scala.collection.JavaConverters._
import scala.beans.BeanProperty import scala.beans.BeanProperty
@RunWith(classOf[JUnitRunner]) @RunWith(classOf[JUnitRunner])
class PetApiTest extends FlatSpec with ShouldMatchers { class PetApiTest extends FlatSpec with Matchers {
behavior of "PetApi" behavior of "PetApi"
val api = new PetApi val api = new PetApi

5
samples/client/petstore/scala/src/test/scala/StoreApiTest.scala
View File

@ -4,15 +4,14 @@ import com.wordnik.petstore.model._
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner import org.scalatest.junit.JUnitRunner
import org.scalatest.FlatSpec import org.scalatest._
import org.scalatest.matchers.ShouldMatchers
import scala.collection.mutable.{ ListBuffer, HashMap } import scala.collection.mutable.{ ListBuffer, HashMap }
import scala.collection.JavaConversions._ import scala.collection.JavaConversions._
import scala.beans.BeanProperty import scala.beans.BeanProperty
@RunWith(classOf[JUnitRunner]) @RunWith(classOf[JUnitRunner])
class StoreApiTest extends FlatSpec with ShouldMatchers { class StoreApiTest extends FlatSpec with Matchers {
behavior of "StoreApi" behavior of "StoreApi"
val api = new StoreApi val api = new StoreApi

5
samples/client/petstore/scala/src/test/scala/UserApiTest.scala
View File

@ -3,15 +3,14 @@ import com.wordnik.petstore.model._
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner import org.scalatest.junit.JUnitRunner
import org.scalatest.FlatSpec import org.scalatest._
import org.scalatest.matchers.ShouldMatchers
import scala.collection.mutable.{ ListBuffer, HashMap } import scala.collection.mutable.{ ListBuffer, HashMap }
import scala.collection.JavaConversions._ import scala.collection.JavaConversions._
import scala.beans.BeanProperty import scala.beans.BeanProperty
@RunWith(classOf[JUnitRunner]) @RunWith(classOf[JUnitRunner])
class UserApiTest extends FlatSpec with ShouldMatchers { class UserApiTest extends FlatSpec with Matchers {
behavior of "UserApi" behavior of "UserApi"
val api = new UserApi val api = new UserApi
api.apiInvoker.defaultHeaders += "api_key" -> "special-key" api.apiInvoker.defaultHeaders += "api_key" -> "special-key"

5
samples/client/wordnik-api/scala/src/test/scala/AccountApiTest.scala
View File

@ -3,15 +3,14 @@ import com.wordnik.client.model._
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner import org.scalatest.junit.JUnitRunner
import org.scalatest.FlatSpec import org.scalatest._
import org.scalatest.matchers.ShouldMatchers
import scala.collection.mutable.{ ListBuffer, HashMap } import scala.collection.mutable.{ ListBuffer, HashMap }
import scala.collection.JavaConversions._ import scala.collection.JavaConversions._
import scala.beans.BeanProperty import scala.beans.BeanProperty
@RunWith(classOf[JUnitRunner]) @RunWith(classOf[JUnitRunner])
class AccountApiTest extends FlatSpec with ShouldMatchers with BaseApiTest { class AccountApiTest extends FlatSpec with Matchers with BaseApiTest {
behavior of "AccountApi" behavior of "AccountApi"
val api = new AccountApi val api = new AccountApi

5
samples/client/wordnik-api/scala/src/test/scala/WordApiTest.scala
View File

@ -6,8 +6,7 @@ import com.wordnik.swagger.core.util.JsonUtil
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner import org.scalatest.junit.JUnitRunner
import org.scalatest.FlatSpec import org.scalatest._
import org.scalatest.matchers.ShouldMatchers
import scala.collection.mutable.{ ListBuffer, HashMap } import scala.collection.mutable.{ ListBuffer, HashMap }
import scala.collection.JavaConversions._ import scala.collection.JavaConversions._
@ -16,7 +15,7 @@ import scala.beans.BeanProperty
import scala.io.Source import scala.io.Source
@RunWith(classOf[JUnitRunner]) @RunWith(classOf[JUnitRunner])
class WordApiTest extends FlatSpec with ShouldMatchers with BaseApiTest { class WordApiTest extends FlatSpec with Matchers with BaseApiTest {
behavior of "WordApi" behavior of "WordApi"
val api = new WordApi val api = new WordApi

5
samples/client/wordnik-api/scala/src/test/scala/WordListApiTest.scala
View File

@ -3,15 +3,14 @@ import com.wordnik.client.model._
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner import org.scalatest.junit.JUnitRunner
import org.scalatest.FlatSpec import org.scalatest._
import org.scalatest.matchers.ShouldMatchers
import scala.collection.mutable.{ ListBuffer, HashMap } import scala.collection.mutable.{ ListBuffer, HashMap }
import scala.collection.JavaConversions._ import scala.collection.JavaConversions._
import scala.beans.BeanProperty import scala.beans.BeanProperty
@RunWith(classOf[JUnitRunner]) @RunWith(classOf[JUnitRunner])
class WordListApiTest extends FlatSpec with ShouldMatchers with BaseApiTest { class WordListApiTest extends FlatSpec with Matchers with BaseApiTest {
behavior of "WordListApi" behavior of "WordListApi"
val api = new WordListApi val api = new WordListApi

5
samples/client/wordnik-api/scala/src/test/scala/WordsApiTest.scala
View File

@ -3,15 +3,14 @@ import com.wordnik.client.model._
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner import org.scalatest.junit.JUnitRunner
import org.scalatest.FlatSpec import org.scalatest._
import org.scalatest.matchers.ShouldMatchers
import scala.collection.mutable.{ ListBuffer, HashMap } import scala.collection.mutable.{ ListBuffer, HashMap }
import scala.collection.JavaConversions._ import scala.collection.JavaConversions._
import scala.beans.BeanProperty import scala.beans.BeanProperty
@RunWith(classOf[JUnitRunner]) @RunWith(classOf[JUnitRunner])
class WordsApiTest extends FlatSpec with ShouldMatchers with BaseApiTest { class WordsApiTest extends FlatSpec with Matchers with BaseApiTest {
behavior of "WordsApi" behavior of "WordsApi"
val api = new WordsApi val api = new WordsApi

2
src/main/scala/com/wordnik/swagger/codegen/util/RemoteUrl.scala
View File

@ -19,7 +19,7 @@ trait RemoteUrl {
connection connection
} }
else if(auth.passAs == "query") { else if(auth.passAs == "query") {
new URL(url + "?%s=%s".format(URLEncoder.encode(auth.keyName), URLEncoder.encode(auth.value))).openConnection() new URL(url + "?%s=%s".format(URLEncoder.encode(auth.keyName, "UTF-8"), URLEncoder.encode(auth.value, "UTF-8"))).openConnection()
} }
else { else {
new URL(url).openConnection() new URL(url).openConnection()