From 74e2fb64901d003629e7ae6702e569081553459c Mon Sep 17 00:00:00 2001 From: Brice Date: Fri, 22 Jan 2021 15:19:41 +1100 Subject: [PATCH] JobData class removed --- .../messaging/jobs/AttachmentDownloadJob.kt | 4 +- .../messaging/jobs/AttachmentUploadJob.kt | 4 +- .../session/libsession/messaging/jobs/Job.kt | 10 +- .../libsession/messaging/jobs/JobData.kt | 351 ------------------ .../messaging/jobs/MessageReceiveJob.kt | 4 +- .../messaging/jobs/MessageSendJob.kt | 4 +- .../messaging/jobs/NotifyPNServerJob.kt | 4 +- 7 files changed, 15 insertions(+), 366 deletions(-) delete mode 100644 libsession/src/main/java/org/session/libsession/messaging/jobs/JobData.kt diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt index 771a87faa..159f16b5c 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt @@ -88,7 +88,7 @@ class AttachmentDownloadJob(val attachmentID: Long, val tsIncomingMessageID: Lon //database functions - override fun serialize(): JobData { + override fun serialize(): Data { val builder = this.createJobDataBuilder() return builder.putLong(KEY_ATTACHMENT_ID, attachmentID) .putLong(KEY_TS_INCOMING_MESSAGE_ID, tsIncomingMessageID) @@ -96,7 +96,7 @@ class AttachmentDownloadJob(val attachmentID: Long, val tsIncomingMessageID: Lon } class Factory: Job.Factory { - override fun create(data: JobData): AttachmentDownloadJob { + override fun create(data: Data): AttachmentDownloadJob { val job = AttachmentDownloadJob(data.getLong(KEY_ATTACHMENT_ID), data.getLong(KEY_TS_INCOMING_MESSAGE_ID)) job.initJob(data) return job diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt index 154573686..9fe4e064e 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt @@ -103,7 +103,7 @@ class AttachmentUploadJob(val attachmentID: Long, val threadID: String, val mess //database functions - override fun serialize(): JobData { + override fun serialize(): Data { val builder = this.createJobDataBuilder() //serialize Message property val kryo = Kryo() @@ -120,7 +120,7 @@ class AttachmentUploadJob(val attachmentID: Long, val threadID: String, val mess } class Factory: Job.Factory { - override fun create(data: JobData): AttachmentUploadJob { + override fun create(data: Data): AttachmentUploadJob { val serializedMessage = data.getByteArray(KEY_MESSAGE) //deserialize Message property val kryo = Kryo() diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/Job.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/Job.kt index 7e2ae3985..1e2e904f5 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/Job.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/Job.kt @@ -17,19 +17,19 @@ interface Job { //database functions - fun serialize(): JobData + fun serialize(): Data - fun initJob(data: JobData) { + fun initJob(data: Data) { id = data.getString(KEY_ID) failureCount = data.getInt(KEY_FAILURE_COUNT) } - fun createJobDataBuilder(): JobData.Builder { - return JobData.Builder().putString(KEY_ID, id) + fun createJobDataBuilder(): Data.Builder { + return Data.Builder().putString(KEY_ID, id) .putInt(KEY_FAILURE_COUNT, failureCount) } interface Factory { - fun create(data: JobData): T + fun create(data: Data): T } } \ No newline at end of file diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/JobData.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/JobData.kt deleted file mode 100644 index a6f10372a..000000000 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/JobData.kt +++ /dev/null @@ -1,351 +0,0 @@ -package org.session.libsession.messaging.jobs - -import com.fasterxml.jackson.annotation.JsonProperty -import java.util.* - -class JobData { - - val EMPTY: JobData = Builder().build() - - @JsonProperty - private var strings: Map - - @JsonProperty - private var stringArrays: Map> - - @JsonProperty - private var integers: Map - - @JsonProperty - private var integerArrays: Map - - @JsonProperty - private var longs: Map - - @JsonProperty - private var longArrays: Map - - @JsonProperty - private var floats: Map - - @JsonProperty - private var floatArrays: Map - - @JsonProperty - private var doubles: Map - - @JsonProperty - private var doubleArrays: Map - - @JsonProperty - private var booleans: Map - - @JsonProperty - private var booleanArrays: Map - - @JsonProperty - private var byteArrays: Map - - constructor(@JsonProperty("strings") strings: MutableMap, - @JsonProperty("stringArrays") stringArrays: Map>, - @JsonProperty("integers") integers: Map, - @JsonProperty("integerArrays") integerArrays: Map, - @JsonProperty("longs") longs: Map, - @JsonProperty("longArrays") longArrays: Map, - @JsonProperty("floats") floats: Map, - @JsonProperty("floatArrays") floatArrays: Map, - @JsonProperty("doubles") doubles: Map, - @JsonProperty("doubleArrays") doubleArrays: Map, - @JsonProperty("booleans") booleans: Map, - @JsonProperty("booleanArrays") booleanArrays: Map, - @JsonProperty("byteArrays") byteArrays: Map) { - this.strings = strings - this.stringArrays = stringArrays - this.integers = integers - this.integerArrays = integerArrays - this.longs = longs - this.longArrays = longArrays - this.floats = floats - this.floatArrays = floatArrays - this.doubles = doubles - this.doubleArrays = doubleArrays - this.booleans = booleans - this.booleanArrays = booleanArrays - this.byteArrays = byteArrays - } - - fun hasString(key: String): Boolean { - return strings.containsKey(key) - } - - fun getString(key: String): String { - throwIfAbsent(strings, key) - return strings[key]!! - } - - fun getStringOrDefault(key: String, defaultValue: String?): String? { - return if (hasString(key)) getString(key) else defaultValue - } - - - fun hasStringArray(key: String): Boolean { - return stringArrays.containsKey(key) - } - - fun getStringArray(key: String): Array? { - throwIfAbsent(stringArrays, key) - return stringArrays[key] - } - - - fun hasInt(key: String): Boolean { - return integers.containsKey(key) - } - - fun getInt(key: String): Int { - throwIfAbsent(integers, key) - return integers[key]!! - } - - fun getIntOrDefault(key: String, defaultValue: Int): Int { - return if (hasInt(key)) getInt(key) else defaultValue - } - - - fun hasIntegerArray(key: String): Boolean { - return integerArrays.containsKey(key) - } - - fun getIntegerArray(key: String): IntArray? { - throwIfAbsent(integerArrays, key) - return integerArrays[key] - } - - - fun hasLong(key: String): Boolean { - return longs.containsKey(key) - } - - fun getLong(key: String): Long { - throwIfAbsent(longs, key) - return longs[key]!! - } - - fun getLongOrDefault(key: String, defaultValue: Long): Long { - return if (hasLong(key)) getLong(key) else defaultValue - } - - - fun hasLongArray(key: String): Boolean { - return longArrays.containsKey(key) - } - - fun getLongArray(key: String): LongArray? { - throwIfAbsent(longArrays, key) - return longArrays[key] - } - - - fun hasFloat(key: String): Boolean { - return floats.containsKey(key) - } - - fun getFloat(key: String): Float { - throwIfAbsent(floats, key) - return floats[key]!! - } - - fun getFloatOrDefault(key: String, defaultValue: Float): Float { - return if (hasFloat(key)) getFloat(key) else defaultValue - } - - - fun hasFloatArray(key: String): Boolean { - return floatArrays.containsKey(key) - } - - fun getFloatArray(key: String): FloatArray? { - throwIfAbsent(floatArrays, key) - return floatArrays[key] - } - - - fun hasDouble(key: String): Boolean { - return doubles.containsKey(key) - } - - fun getDouble(key: String): Double { - throwIfAbsent(doubles, key) - return doubles[key]!! - } - - fun getDoubleOrDefault(key: String, defaultValue: Double): Double { - return if (hasDouble(key)) getDouble(key) else defaultValue - } - - - fun hasDoubleArray(key: String): Boolean { - return floatArrays.containsKey(key) - } - - fun getDoubleArray(key: String): DoubleArray? { - throwIfAbsent(doubleArrays, key) - return doubleArrays[key] - } - - - fun hasBoolean(key: String): Boolean { - return booleans.containsKey(key) - } - - fun getBoolean(key: String): Boolean { - throwIfAbsent(booleans, key) - return booleans[key]!! - } - - fun getBooleanOrDefault(key: String, defaultValue: Boolean): Boolean { - return if (hasBoolean(key)) getBoolean(key) else defaultValue - } - - - fun hasBooleanArray(key: String): Boolean { - return booleanArrays.containsKey(key) - } - - fun getBooleanArray(key: String): BooleanArray? { - throwIfAbsent(booleanArrays, key) - return booleanArrays[key] - } - - fun hasByteArray(key: String): Boolean { - return byteArrays.containsKey(key) - } - - fun getByteArray(key: String): ByteArray { - throwIfAbsent(byteArrays, key) - return byteArrays[key]!! - } - - fun hasParcelable(key: String): Boolean { - return byteArrays!!.containsKey(key) - } - - /*fun getParcelable(key: String, creator: Parcelable.Creator): T { - throwIfAbsent(byteArrays!!, key) - val bytes = byteArrays[key] - return ParcelableUtil.unmarshall(bytes, creator) - }*/ - - private fun throwIfAbsent(map: Map<*, *>, key: String) { - check(map.containsKey(key)) { "Tried to retrieve a value with key '$key', but it wasn't present." } - } - - - class Builder { - private val strings: MutableMap = HashMap() - private val stringArrays: MutableMap> = HashMap() - private val integers: MutableMap = HashMap() - private val integerArrays: MutableMap = HashMap() - private val longs: MutableMap = HashMap() - private val longArrays: MutableMap = HashMap() - private val floats: MutableMap = HashMap() - private val floatArrays: MutableMap = HashMap() - private val doubles: MutableMap = HashMap() - private val doubleArrays: MutableMap = HashMap() - private val booleans: MutableMap = HashMap() - private val booleanArrays: MutableMap = HashMap() - private val byteArrays: MutableMap = HashMap() - fun putString(key: String, value: String?): Builder { - value?.let { strings[key] = value } - return this - } - - fun putStringArray(key: String, value: Array): Builder { - stringArrays[key] = value - return this - } - - fun putInt(key: String, value: Int): Builder { - integers[key] = value - return this - } - - fun putIntArray(key: String, value: IntArray): Builder { - integerArrays[key] = value - return this - } - - fun putLong(key: String, value: Long): Builder { - longs[key] = value - return this - } - - fun putLongArray(key: String, value: LongArray): Builder { - longArrays[key] = value - return this - } - - fun putFloat(key: String, value: Float): Builder { - floats[key] = value - return this - } - - fun putFloatArray(key: String, value: FloatArray): Builder { - floatArrays[key] = value - return this - } - - fun putDouble(key: String, value: Double): Builder { - doubles[key] = value - return this - } - - fun putDoubleArray(key: String, value: DoubleArray): Builder { - doubleArrays[key] = value - return this - } - - fun putBoolean(key: String, value: Boolean): Builder { - booleans[key] = value - return this - } - - fun putBooleanArray(key: String, value: BooleanArray): Builder { - booleanArrays[key] = value - return this - } - - fun putByteArray(key: String, value: ByteArray): Builder { - byteArrays[key] = value - return this - } - - /*fun putParcelable(key: String, value: Parcelable): Builder { - val bytes: ByteArray = ParcelableUtil.marshall(value) - byteArrays[key] = bytes - return this - }*/ - - fun build(): JobData { - return JobData(strings, - stringArrays, - integers, - integerArrays, - longs, - longArrays, - floats, - floatArrays, - doubles, - doubleArrays, - booleans, - booleanArrays, - byteArrays) - } - } - - interface Serializer { - fun serialize(data: JobData): String - fun deserialize(serialized: String): JobData - } - -} \ No newline at end of file diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt index 6a693945e..438a38a87 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt @@ -63,7 +63,7 @@ class MessageReceiveJob(val data: ByteArray, val isBackgroundPoll: Boolean, val //database functions - override fun serialize(): JobData { + override fun serialize(): Data { val builder = this.createJobDataBuilder() builder.putByteArray(KEY_DATA, data) .putBoolean(KEY_IS_BACKGROUND_POLL, isBackgroundPoll) @@ -74,7 +74,7 @@ class MessageReceiveJob(val data: ByteArray, val isBackgroundPoll: Boolean, val } class Factory: Job.Factory { - override fun create(data: JobData): MessageReceiveJob { + override fun create(data: Data): MessageReceiveJob { val job = MessageReceiveJob(data.getByteArray(KEY_DATA), data.getBoolean(KEY_IS_BACKGROUND_POLL), data.getLong(KEY_OPEN_GROUP_MESSAGE_SERVER_ID), data.getString(KEY_OPEN_GROUP_ID)) job.initJob(data) return job diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt index 219b882c8..c7fd708d6 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt @@ -76,7 +76,7 @@ class MessageSendJob(val message: Message, val destination: Destination) : Job { //database functions - override fun serialize(): JobData { + override fun serialize(): Data { val builder = this.createJobDataBuilder() //serialize Message and Destination properties val kryo = Kryo() @@ -95,7 +95,7 @@ class MessageSendJob(val message: Message, val destination: Destination) : Job { } class Factory: Job.Factory { - override fun create(data: JobData): MessageSendJob { + override fun create(data: Data): MessageSendJob { val serializedMessage = data.getByteArray(KEY_MESSAGE) val serializedDestination = data.getByteArray(KEY_DESTINATION) //deserialize Message and Destination properties diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt index df5c409b1..f3564836a 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt @@ -63,7 +63,7 @@ class NotifyPNServerJob(val message: SnodeMessage) : Job { //database functions - override fun serialize(): JobData { + override fun serialize(): Data { val builder = this.createJobDataBuilder() //serialize SnodeMessage property val kryo = Kryo() @@ -77,7 +77,7 @@ class NotifyPNServerJob(val message: SnodeMessage) : Job { } class Factory: Job.Factory { - override fun create(data: JobData): NotifyPNServerJob { + override fun create(data: Data): NotifyPNServerJob { val serializedMessage = data.getByteArray(KEY_MESSAGE) //deserialize SnodeMessage property val kryo = Kryo()