Merge main

.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Oct 19 09:13:53 CEST 2020
+#Thu Oct 22 22:37:52 CEST 2020
 gradle.version=6.3

build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'java'
     id 'org.jetbrains.kotlin.jvm' version '1.4.10'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.4.10'
 }
 
 apply plugin: 'kotlin-kapt' // required
@@ -16,13 +17,15 @@ repositories {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib"
-    implementation 'com.fasterxml.jackson.core:jackson-core: 2.9.8'
-    implementation 'com.fasterxml.jackson.core:jackson-databind: 2.9.8'
-    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.8'
 
     implementation 'info.picocli:picocli:4.5.2'
-    implementation 'com.github.kittinunf.fuel:fuel:2.3.0'
-    implementation 'com.github.kittinunf.fuel:fuel-jackson:2.3.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0'
+    implementation 'io.ktor:ktor-client-core:1.4.1'
+    implementation 'io.ktor:ktor-client-core-jvm:1.4.1'
+    implementation 'io.ktor:ktor-client-apache:1.4.1'
+    implementation 'io.ktor:ktor-client-logging-jvm:1.4.1'
+    implementation 'io.ktor:ktor-client-serialization-jvm:1.4.1'
+
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
 

src/main/kotlin/nl/lengrand/swacli/Configuration.kt

@@ -0,0 +1,18 @@
+package nl.lengrand.swacli
+
+import io.ktor.client.*
+import io.ktor.client.engine.apache.*
+import io.ktor.client.features.json.*
+import io.ktor.client.features.json.serializer.*
+import kotlinx.serialization.json.Json
+
+object Configuration {
+
+    private val jsonSerializer = Json { ignoreUnknownKeys = true}
+
+    fun getHttpClient() = HttpClient(Apache) {
+        install(JsonFeature) {
+            serializer = KotlinxSerializer(jsonSerializer)
+        }
+    }
+}

src/main/kotlin/nl/lengrand/swacli/SwApi.kt

@@ -1,34 +1,31 @@
 package nl.lengrand.swacli
 
-import com.fasterxml.jackson.databind.DeserializationFeature
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.module.kotlin.registerKotlinModule
-import com.github.kittinunf.fuel.Fuel
-import com.github.kittinunf.fuel.jackson.responseObject
-
-val mapper: ObjectMapper = ObjectMapper().registerKotlinModule().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+import io.ktor.client.request.*
+import io.ktor.http.*
+import kotlinx.serialization.Serializable
 
 const val BASE_URL = "https://swapi.dev/api"
 
-class SwApi {
-    companion object{
-        fun getPeople(query : String?) : Response<People> {
-            return Fuel.get("$BASE_URL/people/${queryString(query)}")
-                .header("accept", "application/json")
-                .responseObject<Response<People>>(mapper).third.get()
-        }
+object SwApi {
+
+    private val httpClient = Configuration.getHttpClient()
 
-        fun getPlanets(query : String?) : Response<Planet> {
-            return Fuel.get("$BASE_URL/planets/${queryString(query)}")
-                .header("accept", "application/json")
-                .responseObject<Response<Planet>>(mapper).third.get()
+    suspend fun getPeople(query : String?) : Response<People> {
+        return httpClient.get("$BASE_URL/people/${queryString(query)}") {
+            header("Content-Type", ContentType.Application.Json.toString())
         }
+    }
 
-        private fun queryString(query: String?) = if(query == null)  "" else  "?search=${query}"
+    suspend fun getPlanets(query : String?) : Response<Planet> {
+        return httpClient.get("$BASE_URL/planets/${queryString(query)}") {
+            header("Content-Type", ContentType.Application.Json.toString())
+        }
     }
+
+    private fun queryString(query: String?) = if(query == null)  "" else  "?search=${query}"
 }
 
-sealed class Data
-data class Response<Data>(val count: Int, val next : String?, val previous : String?, val results : List<Data>)
-data class Planet(val climate: String, val name: String, val gravity: String, val orbital_period: String, val diameter: String) : Data()
-data class People(val name: String, val height: String, val mass: String, val hair_color: String, val homeworld: String, val birth_year: String) : Data()
+@Serializable sealed class Data
+@Serializable data class Response<Data>(val count: Int, val next : String?, val previous : String?, val results : List<Data>)
+@Serializable data class Planet(val climate: String, val name: String, val gravity: String, val orbital_period: String, val diameter: String) : Data()
+@Serializable data class People(val name: String, val height: String, val mass: String, val hair_color: String, val homeworld: String, val birth_year: String) : Data()

src/main/kotlin/nl/lengrand/swacli/SwaCLIOptions.kt

@@ -1,5 +1,6 @@
 package nl.lengrand.swacli
 
+import kotlinx.coroutines.runBlocking
 import picocli.CommandLine
 import picocli.CommandLine.*
 import java.util.concurrent.Callable
@@ -28,10 +29,12 @@ class SwaCLIOptions : Callable<Int> {
     }
 
     override fun call(): Int {
-        if(exclusive.characters)
-            PrettyPrinter.print(SwApi.getPeople(searchQuery))
-        if(exclusive.planets)
-            PrettyPrinter.print(SwApi.getPlanets(searchQuery))
+        runBlocking {
+            if (exclusive.characters)
+                PrettyPrinter.print(SwApi.getPeople(searchQuery))
+            if (exclusive.planets)
+                PrettyPrinter.print(SwApi.getPlanets(searchQuery))
+        }
 
         return 0
     }

src/main/kotlin/nl/lengrand/swacli/SwaCLIProgrammatic.kt

@@ -1,13 +1,14 @@
 package nl.lengrand.swacli
 
+import kotlinx.coroutines.runBlocking
 import picocli.CommandLine
 import picocli.CommandLine.IExecutionStrategy
 import picocli.CommandLine.Model.CommandSpec
 import picocli.CommandLine.Model.PositionalParamSpec
 import picocli.CommandLine.ParseResult
 import kotlin.system.exitProcess
 
-object SwaCLIProgrammatic {
+object  SwaCLIProgrammatic {
 
     private fun run(parseResult: ParseResult): Int {
         val helpExitCode = CommandLine.executeHelpRequest(parseResult)
@@ -17,10 +18,12 @@ object SwaCLIProgrammatic {
             val subResult = parseResult.subcommand()
             val searchQuery = if (subResult.hasMatchedPositional(0)) subResult.matchedPositional(0).stringValues()[0] else null
 
-            if (subResult.commandSpec().name() == "planets")
-                PrettyPrinter.print(SwApi.getPlanets(searchQuery))
-            if (subResult.commandSpec().name() == "people")
-                PrettyPrinter.print(SwApi.getPeople(searchQuery))
+            runBlocking {
+                if (subResult.commandSpec().name() == "planets")
+                    PrettyPrinter.print(SwApi.getPlanets(searchQuery))
+                if (subResult.commandSpec().name() == "people")
+                    PrettyPrinter.print(SwApi.getPeople(searchQuery))
+            }
         }
         return 0
     }

src/main/kotlin/nl/lengrand/swacli/SwaCLISubCommands.kt

@@ -1,5 +1,6 @@
 package nl.lengrand.swacli
 
+import kotlinx.coroutines.runBlocking
 import picocli.CommandLine
 import picocli.CommandLine.*
 import picocli.CommandLine.Model.*
@@ -37,7 +38,9 @@ class PlanetsCommand : Callable<Int> {
     private var searchQuery : String? = null
 
     override fun call(): Int {
-        PrettyPrinter.print(SwApi.getPlanets(searchQuery))
+        runBlocking {
+            PrettyPrinter.print(SwApi.getPlanets(searchQuery))
+        }
         return 0
     }
 }
@@ -49,7 +52,9 @@ class PeopleCommand : Callable<Int> {
     private var searchQuery : String? = null
 
     override fun call(): Int {
-        PrettyPrinter.print(SwApi.getPeople(searchQuery))
+        runBlocking {
+            PrettyPrinter.print(SwApi.getPeople(searchQuery))
+        }
         return 0
     }
 }