From 202b6ec10b234325941b9c1d3d5e39c267b3cfe2 Mon Sep 17 00:00:00 2001 From: Paul Hawke Date: Mon, 7 Jul 2025 09:03:21 -0500 Subject: [PATCH] Converted MwParseResult / MwParseResponse to kotlin --- .../nrw/commons/media/MwParseResponse.java | 25 ------------------- .../free/nrw/commons/media/MwParseResponse.kt | 17 +++++++++++++ .../free/nrw/commons/media/MwParseResult.java | 18 ------------- .../free/nrw/commons/media/MwParseResult.kt | 18 +++++++++++++ 4 files changed, 35 insertions(+), 43 deletions(-) delete mode 100644 app/src/main/java/fr/free/nrw/commons/media/MwParseResponse.java create mode 100644 app/src/main/java/fr/free/nrw/commons/media/MwParseResponse.kt delete mode 100644 app/src/main/java/fr/free/nrw/commons/media/MwParseResult.java create mode 100644 app/src/main/java/fr/free/nrw/commons/media/MwParseResult.kt diff --git a/app/src/main/java/fr/free/nrw/commons/media/MwParseResponse.java b/app/src/main/java/fr/free/nrw/commons/media/MwParseResponse.java deleted file mode 100644 index 28df3811a..000000000 --- a/app/src/main/java/fr/free/nrw/commons/media/MwParseResponse.java +++ /dev/null @@ -1,25 +0,0 @@ -package fr.free.nrw.commons.media; - -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; - -import fr.free.nrw.commons.wikidata.mwapi.MwResponse; - -public class MwParseResponse extends MwResponse { - @Nullable - private MwParseResult parse; - - @Nullable - public MwParseResult parse() { - return parse; - } - - public boolean success() { - return parse != null; - } - - @VisibleForTesting - protected void setParse(@Nullable MwParseResult parse) { - this.parse = parse; - } -} diff --git a/app/src/main/java/fr/free/nrw/commons/media/MwParseResponse.kt b/app/src/main/java/fr/free/nrw/commons/media/MwParseResponse.kt new file mode 100644 index 000000000..fc0282a9e --- /dev/null +++ b/app/src/main/java/fr/free/nrw/commons/media/MwParseResponse.kt @@ -0,0 +1,17 @@ +package fr.free.nrw.commons.media + +import androidx.annotation.VisibleForTesting +import fr.free.nrw.commons.wikidata.mwapi.MwResponse + +class MwParseResponse : MwResponse() { + private var parse: MwParseResult? = null + + fun parse(): MwParseResult? = parse + + fun success(): Boolean = parse != null + + @VisibleForTesting + protected fun setParse(parse: MwParseResult?) { + this.parse = parse + } +} diff --git a/app/src/main/java/fr/free/nrw/commons/media/MwParseResult.java b/app/src/main/java/fr/free/nrw/commons/media/MwParseResult.java deleted file mode 100644 index edb7ff447..000000000 --- a/app/src/main/java/fr/free/nrw/commons/media/MwParseResult.java +++ /dev/null @@ -1,18 +0,0 @@ -package fr.free.nrw.commons.media; - -import com.google.gson.annotations.SerializedName; - -public class MwParseResult { - @SuppressWarnings("unused") private int pageid; - @SuppressWarnings("unused") private int index; - private MwParseText text; - - public String text() { - return text.text; - } - - - public class MwParseText{ - @SerializedName("*") private String text; - } -} diff --git a/app/src/main/java/fr/free/nrw/commons/media/MwParseResult.kt b/app/src/main/java/fr/free/nrw/commons/media/MwParseResult.kt new file mode 100644 index 000000000..7aacdea09 --- /dev/null +++ b/app/src/main/java/fr/free/nrw/commons/media/MwParseResult.kt @@ -0,0 +1,18 @@ +package fr.free.nrw.commons.media + +import com.google.gson.annotations.SerializedName + +class MwParseResult { + private val pageid = 0 + private val index = 0 + private val text: MwParseText? = null + + fun text(): String? { + return text?.text + } + + inner class MwParseText { + @SerializedName("*") + internal val text: String? = null + } +}