Fix deprecated code

pemistahl · Jul 19, 2021 · b8c3a25 · b8c3a25
1 parent f2ca537
commit b8c3a25
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 11 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -29,7 +29,7 @@ linguaGroupId=com.github.pemistahl
 
 linguaArtifactId=lingua
 
-linguaVersion=1.1.0
+linguaVersion=1.2.0-SNAPSHOT
 
 linguaName=Lingua
 

diff --git a/...port/kotlin/com/github/pemistahl/lingua/report/AbstractLanguageDetectionAccuracyReport.kt b/...port/kotlin/com/github/pemistahl/lingua/report/AbstractLanguageDetectionAccuracyReport.kt
@@ -86,8 +86,8 @@ abstract class AbstractLanguageDetectionAccuracyReport(
     fun afterAll() {
         val projectRootPath = Paths.get("").toAbsolutePath().toString()
         val accuracyReportsDirectoryName = "accuracy-reports"
-        val detectorDirectoryName = implementationToUse.name.toLowerCase(Locale.ROOT)
-        val languageReportFileName = "${language.name.toLowerCase(Locale.ROOT).capitalize()}.txt"
+        val detectorDirectoryName = implementationToUse.name.lowercase()
+        val languageReportFileName = "${language.name.lowercase().replaceFirstChar { it.titlecase() }}.txt"
         val accuracyReportsDirectoryPath = Paths.get(
             projectRootPath,
             accuracyReportsDirectoryName,
@@ -184,7 +184,7 @@ abstract class AbstractLanguageDetectionAccuracyReport(
             OPENNLP -> {
                 val detectedLanguage = opennlpDetector.predictLanguage(element)
                 val isoCode = try {
-                    val isoCode = detectedLanguage.lang.toUpperCase(Locale.ROOT)
+                    val isoCode = detectedLanguage.lang.uppercase()
                     IsoCode639_3.valueOf(mapOpenNlpIsoCodeToLinguaIsoCode(isoCode))
                 } catch (e: IllegalArgumentException) {
                     IsoCode639_3.NONE
@@ -249,15 +249,15 @@ abstract class AbstractLanguageDetectionAccuracyReport(
         return when {
             !locale.isPresent -> UNKNOWN
             locale.get().language.startsWith("zh") -> CHINESE
-            else -> Language.getByIsoCode639_1(IsoCode639_1.valueOf(locale.get().language.toUpperCase(Locale.ROOT)))
+            else -> Language.getByIsoCode639_1(IsoCode639_1.valueOf(locale.get().language.uppercase()))
         }
     }
 
     private fun mapLanguageResultToLanguage(result: LanguageResult): Language {
         return when {
             result.isUnknown -> UNKNOWN
             result.language.startsWith("zh") -> CHINESE
-            else -> Language.getByIsoCode639_1(IsoCode639_1.valueOf(result.language.toUpperCase(Locale.ROOT)))
+            else -> Language.getByIsoCode639_1(IsoCode639_1.valueOf(result.language.uppercase()))
         }
     }
 

diff --git a/src/main/kotlin/com/github/pemistahl/lingua/api/LanguageDetector.kt b/src/main/kotlin/com/github/pemistahl/lingua/api/LanguageDetector.kt
@@ -36,7 +36,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.runBlocking
-import java.util.Locale
 import java.util.SortedMap
 import java.util.TreeMap
 import kotlin.math.ln

diff --git a/src/main/kotlin/com/github/pemistahl/lingua/app/App.kt b/src/main/kotlin/com/github/pemistahl/lingua/app/App.kt
@@ -21,7 +21,6 @@ import com.github.pemistahl.lingua.api.LanguageDetectorBuilder
 import com.github.pemistahl.lingua.api.LanguageDetectorBuilder.Companion.fromAllLanguages
 import com.github.pemistahl.lingua.api.LanguageDetectorBuilder.Companion.fromIsoCodes639_1
 import java.io.Console
-import java.util.Locale
 import java.util.Scanner
 
 fun main() {

diff --git a/src/main/kotlin/com/github/pemistahl/lingua/internal/Constant.kt b/src/main/kotlin/com/github/pemistahl/lingua/internal/Constant.kt
@@ -120,7 +120,7 @@ internal object Constant {
     )
 
     fun isJapaneseAlphabet(char: Char): Boolean {
-        val script = Character.UnicodeScript.of(char.toInt())
+        val script = Character.UnicodeScript.of(char.code)
         return script == Character.UnicodeScript.HIRAGANA ||
             script == Character.UnicodeScript.KATAKANA ||
             script == Character.UnicodeScript.HAN

diff --git a/src/main/kotlin/com/github/pemistahl/lingua/internal/TrainingDataLanguageModel.kt b/src/main/kotlin/com/github/pemistahl/lingua/internal/TrainingDataLanguageModel.kt
@@ -24,7 +24,6 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import java.util.Locale
 
 @Serializable
 internal data class JsonLanguageModel(val language: Language, val ngrams: Map<Fraction, String>)
@@ -89,7 +88,6 @@ internal data class TrainingDataLanguageModel(
             for ((fraction, ngrams) in jsonLanguageModel.ngrams) {
                 val fractionAsDouble = fraction.toDouble()
                 for (ngram in ngrams.split(' ')) {
-                    // Note: Don't use `[...] =` because that wraps primitive as Object
                     jsonRelativeFrequencies.put(ngram, fractionAsDouble)
                 }
             }