diff --git a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/Definition.scala b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/Definition.scala index 6b931bac89e..67d29195bf3 100644 --- a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/Definition.scala +++ b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/Definition.scala @@ -20,7 +20,7 @@ case class Definition ( relatedWords: List[Related], sequence: String, word: String, - textProns: List[TextPron], notes: List[Note], + textProns: List[TextPron], partOfSpeech: String) diff --git a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/Example.scala b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/Example.scala index 1c7096c0311..3d3e45996a2 100644 --- a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/Example.scala +++ b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/Example.scala @@ -5,15 +5,15 @@ import com.wordnik.client.model.ScoredWord import com.wordnik.client.model.ContentProvider case class Example ( id: Long, - text: String, - title: String, exampleId: Long, + title: String, + text: String, score: ScoredWord, sentence: Sentence, - year: Int, - provider: ContentProvider, word: String, + provider: ContentProvider, + year: Int, rating: Float, - url: String, - documentId: Long) + documentId: Long, + url: String) diff --git a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/Related.scala b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/Related.scala index 1f7eb97bb31..98217976dcd 100644 --- a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/Related.scala +++ b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/Related.scala @@ -2,10 +2,10 @@ package com.wordnik.client.model case class Related ( label1: String, - label2: String, relationshipType: String, + label2: String, label3: String, words: List[String], - label4: String, - gram: String) + gram: String, + label4: String) diff --git a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/ScoredWord.scala b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/ScoredWord.scala index 444d85e26a5..5d937fc024d 100644 --- a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/ScoredWord.scala +++ b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/ScoredWord.scala @@ -1,14 +1,14 @@ package com.wordnik.client.model case class ScoredWord ( - id: Long, position: Int, - lemma: String, + id: Long, docTermCount: Int, + lemma: String, wordType: String, score: Float, - word: String, sentenceId: Long, + word: String, stopword: Boolean, baseWordScore: Double, partOfSpeech: String) diff --git a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/Sentence.scala b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/Sentence.scala index 9c699f26d20..1a58dc98f64 100644 --- a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/Sentence.scala +++ b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/Sentence.scala @@ -2,8 +2,8 @@ package com.wordnik.client.model import com.wordnik.client.model.ScoredWord case class Sentence ( - id: Long, hasScoredWords: Boolean, + id: Long, scoredWords: List[ScoredWord], display: String, rating: Int, diff --git a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/SimpleExample.scala b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/SimpleExample.scala index 2eadd7f0dda..1827b2e15c4 100644 --- a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/SimpleExample.scala +++ b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/SimpleExample.scala @@ -2,7 +2,7 @@ package com.wordnik.client.model case class SimpleExample ( id: Long, - text: String, title: String, + text: String, url: String) diff --git a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/User.scala b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/User.scala index 18b888d6036..41dcd1ee8db 100644 --- a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/User.scala +++ b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/User.scala @@ -3,8 +3,8 @@ package com.wordnik.client.model case class User ( id: Long, username: String, - status: Int, email: String, + status: Int, faceBookId: String, userName: String, displayName: String, diff --git a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordList.scala b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordList.scala index 92a0af7dbc3..e7f9c4fa7d9 100644 --- a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordList.scala +++ b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordList.scala @@ -3,14 +3,14 @@ package com.wordnik.client.model import java.util.Date case class WordList ( id: Long, - updatedAt: Date, - username: String, permalink: String, - description: String, - createdAt: Date, - lastActivityAt: Date, name: String, + createdAt: Date, + updatedAt: Date, + lastActivityAt: Date, + username: String, userId: Long, + description: String, numberWordsInList: Long, `type`: String) diff --git a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordListWord.scala b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordListWord.scala index 21fc453823e..d1c1d5b3a8f 100644 --- a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordListWord.scala +++ b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordListWord.scala @@ -3,10 +3,10 @@ package com.wordnik.client.model import java.util.Date case class WordListWord ( id: Long, - username: String, - createdAt: Date, - userId: Long, - numberCommentsOnWord: Long, word: String, + username: String, + userId: Long, + createdAt: Date, + numberCommentsOnWord: Long, numberLists: Long) diff --git a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordObject.scala b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordObject.scala index 5e42f90e8da..85faa1764ec 100644 --- a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordObject.scala +++ b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordObject.scala @@ -2,8 +2,8 @@ package com.wordnik.client.model case class WordObject ( id: Long, - originalWord: String, word: String, + originalWord: String, suggestions: List[String], canonicalForm: String, vulgar: String) diff --git a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordOfTheDay.scala b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordOfTheDay.scala index 94788f0f565..3c64a66571b 100644 --- a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordOfTheDay.scala +++ b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordOfTheDay.scala @@ -11,10 +11,10 @@ case class WordOfTheDay ( createdBy: String, createdAt: Date, contentProvider: ContentProvider, - word: String, htmlExtra: String, + word: String, definitions: List[SimpleDefinition], examples: List[SimpleExample], - publishDate: Date, - note: String) + note: String, + publishDate: Date) diff --git a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordSearchResults.scala b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordSearchResults.scala index 7a0624f109c..885c35fd7a9 100644 --- a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordSearchResults.scala +++ b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordSearchResults.scala @@ -2,6 +2,6 @@ package com.wordnik.client.model import com.wordnik.client.model.WordSearchResult case class WordSearchResults ( - totalResults: Int, - searchResults: List[WordSearchResult]) + searchResults: List[WordSearchResult], + totalResults: Int) diff --git a/samples/client/wordnik-api/scala/src/test/scala/WordApiTest.scala b/samples/client/wordnik-api/scala/src/test/scala/WordApiTest.scala index c9530b02477..d6fb12d0c0c 100644 --- a/samples/client/wordnik-api/scala/src/test/scala/WordApiTest.scala +++ b/samples/client/wordnik-api/scala/src/test/scala/WordApiTest.scala @@ -25,7 +25,7 @@ class WordApiTest extends FlatSpec with ShouldMatchers with BaseApiTest { it should "verify the word apis" in { val json = Source.fromURL("http://api.wordnik.com/v4/word.json").mkString val doc = JsonUtil.getJsonMapper.readValue(json, classOf[Documentation]) - assert(doc.getApis.size === 11) + assert(doc.getApis.size === 12) } it should "fetch a word" in { diff --git a/samples/client/wordnik-api/scala/src/test/scala/WordListApiTest.scala b/samples/client/wordnik-api/scala/src/test/scala/WordListApiTest.scala index 2b5c85c29d3..f609862ffa3 100644 --- a/samples/client/wordnik-api/scala/src/test/scala/WordListApiTest.scala +++ b/samples/client/wordnik-api/scala/src/test/scala/WordListApiTest.scala @@ -24,17 +24,17 @@ class WordListApiTest extends FlatSpec with ShouldMatchers with BaseApiTest { val wordListsApi = new WordListsApi val wordList = WordList( - 0, - new java.util.Date, - null, - null, - "some words I want to play with", - null, - null, - "my test list", - 0, - 0, - "PUBLIC") + 0, // id + null, // permalink + "my test list", // name + new java.util.Date, //created at + null, // updated at + null, // lastActivityAt + null, // username + 0, // user id + "some words I want to play with", // description + 0, // words in list + "PUBLIC") // type var sampleList = wordListsApi.createWordList(wordList, auth.token) match { case Some(wl) => wl