Merge pull request #77 from PokeAPI/cleanup

Add support for machines and form names

Author: sargunv

src/main/kotlin/me/sargunvohra/lib/pokekotlin/client/PokeApi.kt

@@ -26,6 +26,7 @@ import me.sargunvohra.lib.pokekotlin.model.Language
 import me.sargunvohra.lib.pokekotlin.model.Location
 import me.sargunvohra.lib.pokekotlin.model.LocationArea
 import me.sargunvohra.lib.pokekotlin.model.LocationAreaEncounter
+import me.sargunvohra.lib.pokekotlin.model.Machine
 import me.sargunvohra.lib.pokekotlin.model.Move
 import me.sargunvohra.lib.pokekotlin.model.MoveAilment
 import me.sargunvohra.lib.pokekotlin.model.MoveBattleStyle
@@ -115,6 +116,8 @@ interface PokeApi {
 
     fun getRegionList(offset: Int, limit: Int): NamedApiResourceList
 
+    fun getMachineList(offset: Int, limit: Int): ApiResourceList
+
     fun getAbilityList(offset: Int, limit: Int): NamedApiResourceList
 
     fun getCharacteristicList(offset: Int, limit: Int): ApiResourceList
@@ -209,6 +212,8 @@ interface PokeApi {
 
     fun getRegion(id: Int): Region
 
+    fun getMachine(id: Int): Machine
+
     fun getAbility(id: Int): Ability
 
     fun getCharacteristic(id: Int): Characteristic

src/main/kotlin/me/sargunvohra/lib/pokekotlin/client/PokeApiClient.kt

@@ -139,6 +139,13 @@ class PokeApiClient(
 
     // endregion
 
+    // region Machines
+
+    override fun getMachineList(offset: Int, limit: Int) =
+        service.getMachineList(offset, limit).result()
+
+    // endregion Machines
+
     // region Pokemon
 
     override fun getAbilityList(offset: Int, limit: Int) =
@@ -290,6 +297,12 @@ class PokeApiClient(
 
     // endregion Locations
 
+    // region Machines
+
+    override fun getMachine(id: Int) = service.getMachine(id).result()
+
+    // endregion Machines
+
     // region Pokemon
 
     override fun getAbility(id: Int) = service.getAbility(id).result()

src/main/kotlin/me/sargunvohra/lib/pokekotlin/client/PokeApiService.kt

@@ -26,6 +26,7 @@ import me.sargunvohra.lib.pokekotlin.model.Language
 import me.sargunvohra.lib.pokekotlin.model.Location
 import me.sargunvohra.lib.pokekotlin.model.LocationArea
 import me.sargunvohra.lib.pokekotlin.model.LocationAreaEncounter
+import me.sargunvohra.lib.pokekotlin.model.Machine
 import me.sargunvohra.lib.pokekotlin.model.Move
 import me.sargunvohra.lib.pokekotlin.model.MoveAilment
 import me.sargunvohra.lib.pokekotlin.model.MoveBattleStyle
@@ -277,6 +278,16 @@ internal interface PokeApiService {
 
     // endregion
 
+    // region Machines
+
+    @GET("machine/")
+    fun getMachineList(
+        @Query("offset") offset: Int,
+        @Query("limit") limit: Int
+    ): Call<ApiResourceList>
+
+    // endregion
+
     // region Pokemon
 
     @GET("ability/")
@@ -508,6 +519,13 @@ internal interface PokeApiService {
 
     // endregion Locations
 
+    // region Machines
+
+    @GET("machine/{id}/")
+    fun getMachine(@Path("id") id: Int): Call<Machine>
+
+    // endregion
+
     // region Pokemon
 
     @GET("ability/{id}/")

src/main/kotlin/me/sargunvohra/lib/pokekotlin/client/RxPokeApi.kt

@@ -26,6 +26,7 @@ import me.sargunvohra.lib.pokekotlin.model.Language
 import me.sargunvohra.lib.pokekotlin.model.Location
 import me.sargunvohra.lib.pokekotlin.model.LocationArea
 import me.sargunvohra.lib.pokekotlin.model.LocationAreaEncounter
+import me.sargunvohra.lib.pokekotlin.model.Machine
 import me.sargunvohra.lib.pokekotlin.model.Move
 import me.sargunvohra.lib.pokekotlin.model.MoveAilment
 import me.sargunvohra.lib.pokekotlin.model.MoveBattleStyle
@@ -116,6 +117,8 @@ interface RxPokeApi {
 
     fun getRegionList(offset: Int, limit: Int): Observable<NamedApiResourceList>
 
+    fun getMachineList(offset: Int, limit: Int): Observable<ApiResourceList>
+
     fun getAbilityList(offset: Int, limit: Int): Observable<NamedApiResourceList>
 
     fun getCharacteristicList(offset: Int, limit: Int): Observable<ApiResourceList>
@@ -210,6 +213,8 @@ interface RxPokeApi {
 
     fun getRegion(id: Int): Observable<Region>
 
+    fun getMachine(id: Int): Observable<Machine>
+
     fun getAbility(id: Int): Observable<Ability>
 
     fun getCharacteristic(id: Int): Observable<Characteristic>

src/main/kotlin/me/sargunvohra/lib/pokekotlin/client/RxPokeApiClient.kt

@@ -1,7 +1,7 @@
 package me.sargunvohra.lib.pokekotlin.client
 
 class RxPokeApiClient(
-    private val clientConfig: ClientConfig = ClientConfig()
+    clientConfig: ClientConfig = ClientConfig()
 ) : RxPokeApi {
 
     private val service = RxPokeApiServiceImpl(clientConfig)
@@ -126,6 +126,12 @@ class RxPokeApiClient(
 
     // endregion
 
+    // region Machines
+
+    override fun getMachineList(offset: Int, limit: Int) = service.getMachineList(offset, limit)
+
+    // endregion
+
     // region Pokemon
 
     override fun getAbilityList(offset: Int, limit: Int) = service.getAbilityList(offset, limit)
@@ -270,6 +276,12 @@ class RxPokeApiClient(
 
     // endregion Locations
 
+    // region Machines
+
+    override fun getMachine(id: Int) = service.getMachine(id)
+
+    // endregion Machines
+
     // region Pokemon
 
     override fun getAbility(id: Int) = service.getAbility(id)

src/main/kotlin/me/sargunvohra/lib/pokekotlin/client/RxPokeApiService.kt

@@ -26,6 +26,7 @@ import me.sargunvohra.lib.pokekotlin.model.Language
 import me.sargunvohra.lib.pokekotlin.model.Location
 import me.sargunvohra.lib.pokekotlin.model.LocationArea
 import me.sargunvohra.lib.pokekotlin.model.LocationAreaEncounter
+import me.sargunvohra.lib.pokekotlin.model.Machine
 import me.sargunvohra.lib.pokekotlin.model.Move
 import me.sargunvohra.lib.pokekotlin.model.MoveAilment
 import me.sargunvohra.lib.pokekotlin.model.MoveBattleStyle
@@ -277,6 +278,16 @@ internal interface RxPokeApiService {
 
     // endregion
 
+    // region Machines
+
+    @GET("machine/")
+    fun getMachineList(
+        @Query("offset") offset: Int,
+        @Query("limit") limit: Int
+    ): Observable<ApiResourceList>
+
+    // endregion
+
     // region Pokemon
 
     @GET("ability/")
@@ -508,6 +519,13 @@ internal interface RxPokeApiService {
 
     // endregion Locations
 
+    // region Machines
+
+    @GET("machine/{id}/")
+    fun getMachine(@Path("id") id: Int): Observable<Machine>
+
+    // endregion
+
     // region Pokemon
 
     @GET("ability/{id}/")

src/main/kotlin/me/sargunvohra/lib/pokekotlin/model/Language.kt

@@ -0,0 +1,8 @@
+package me.sargunvohra.lib.pokekotlin.model
+
+data class Machine(
+    val id: Int,
+    val item: NamedApiResource,
+    val move: NamedApiResource,
+    val versionGroup: NamedApiResource
+)

src/main/kotlin/me/sargunvohra/lib/pokekotlin/model/Machine.kt

@@ -14,7 +14,8 @@ data class Item(
     val names: List<Name>,
     val heldByPokemon: List<ItemHolderPokemon>,
     val babyTriggerFor: ApiResource?,
-    val sprites: ItemSprites
+    val sprites: ItemSprites,
+    val machines: List<MachineVersionDetail>
 )
 
 data class ItemSprites(

src/main/kotlin/me/sargunvohra/lib/pokekotlin/model/items.kt

@@ -23,7 +23,8 @@ data class Move(
     val pastValues: List<PastMoveStatValues>,
     val statChanges: List<MoveStatChange>,
     val target: NamedApiResource,
-    val type: NamedApiResource
+    val type: NamedApiResource,
+    val machines: List<MachineVersionDetail>
 )
 
 data class ContestComboSets(