From 39dcd04750eef1581d0bdde394371ef9ca2808b9 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 24 Aug 2020 17:10:49 -0300
Subject: Get rid of Jackson and only use multi-platform serialization

---
 .../src/main/java/net/taler/common/ContractTerms.kt    | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'taler-kotlin-android/src/main/java/net/taler/common/ContractTerms.kt')

diff --git a/taler-kotlin-android/src/main/java/net/taler/common/ContractTerms.kt b/taler-kotlin-android/src/main/java/net/taler/common/ContractTerms.kt
index 8bf77e8..2c50fa9 100644
--- a/taler-kotlin-android/src/main/java/net/taler/common/ContractTerms.kt
+++ b/taler-kotlin-android/src/main/java/net/taler/common/ContractTerms.kt
@@ -17,10 +17,6 @@
 package net.taler.common
 
 import androidx.annotation.RequiresApi
-import com.fasterxml.jackson.annotation.JsonIgnore
-import com.fasterxml.jackson.annotation.JsonInclude
-import com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL
-import com.fasterxml.jackson.annotation.JsonProperty
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import net.taler.common.TalerUtils.getLocalizedString
@@ -31,36 +27,24 @@ import net.taler.lib.common.Timestamp
 data class ContractTerms(
     val summary: String,
     @SerialName("summary_i18n")
-    @get:JsonProperty("summary_i18n")
     val summaryI18n: Map<String, String>? = null,
     val amount: Amount,
     @SerialName("fulfillment_url")
-    @get:JsonProperty("fulfillment_url")
     val fulfillmentUrl: String,
     val products: List<ContractProduct>,
     @SerialName("wire_transfer_deadline")
-    @get:JsonProperty("wire_transfer_deadline")
     val wireTransferDeadline: Timestamp? = null,
     @SerialName("refund_deadline")
-    @get:JsonProperty("refund_deadline")
     val refundDeadline: Timestamp? = null
 )
 
-@JsonInclude(NON_NULL)
 abstract class Product {
-    @get:JsonProperty("product_id")
     abstract val productId: String?
     abstract val description: String
-
-    @get:JsonProperty("description_i18n")
     abstract val descriptionI18n: Map<String, String>?
     abstract val price: Amount
-
-    @get:JsonProperty("delivery_location")
     abstract val location: String?
     abstract val image: String?
-
-    @get:JsonIgnore
     val localizedDescription: String
         @RequiresApi(26)
         get() = getLocalizedString(descriptionI18n, description)
@@ -79,12 +63,12 @@ data class ContractProduct(
     override val image: String? = null,
     val quantity: Int
 ) : Product() {
-    @get:JsonIgnore
     val totalPrice: Amount by lazy {
         price * quantity
     }
 }
 
+@Serializable
 data class ContractMerchant(
     val name: String
 )
-- 
cgit v1.2.3