fix codesmell and update some rules on detekt

muhrifqii · Jan 1, 2024 · 39ba1e2 · 39ba1e2
1 parent 6de6484
commit 39ba1e2
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 11 deletions.
diff --git a/detekt.yml b/detekt.yml
@@ -91,5 +91,9 @@ style:
     max: 3
   PreferToOverPairSyntax:
     active: true
+  UnnecessaryAbstractClass:
+    active: true
+    excludes: *excludedDirs
+
 formatting:
   excludes: *excludedDirs
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,4 @@
+org.gradle.jvmargs=-Xmx5g -Dfile.encoding=UTF-8
 android.useAndroidX=true
 android.enableJetifier=false
 kotlin.code.style=official

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ agp = "8.2.0"
 appcompat = "1.6.1"
 constraintlayout = "2.1.4"
 core-ktx = "1.12.0"
-detekt = "1.20.0-RC2"
+detekt = "1.23.4"
 espresso-core = "3.5.1"
 fuel = "2.3.1"
 junit = "4.13.2"

diff --git a/parserss/src/main/java/com/github/muhrifqii/parserss/ParserExecutor.kt b/parserss/src/main/java/com/github/muhrifqii/parserss/ParserExecutor.kt
@@ -52,7 +52,9 @@ class ParserExecutor<T>(
         if (element.name != RSSVersion.RSS_V1.elementName &&
             element.name != RSSVersion.RSS_V2.elementName &&
             element.name != RSSVersion.RSS_ATOM.elementName
-        ) return element
+        ) {
+            return element
+        }
         val attrCount = parser.attributeCount
         for (i in 0 until attrCount) {
             val attribute = parser.getRSSAttributeElement(i, pullParserNSAware)
@@ -186,10 +188,11 @@ class ParserExecutor<T>(
             ParseRSSKeyword.LINK -> mode[LinkEnabledObject::class.java] = {
                 val rel = parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, ParseRSSKeyword.ATTR_REL) ?: ""
                 val href = parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, ParseRSSKeyword.ATTR_HREF)
-                if (rel == "self" && it is RSSFeed)
+                if (rel == "self" && it is RSSFeed) {
                     it.link = href
-                else if (rel == "alternate" && it is RSSItem)
+                } else if (rel == "alternate" && it is RSSItem) {
                     it.link = href
+                }
             }
             ParseRSSKeyword.RIGHTS -> mode[CopyrightsEnabledObject::class.java] = {
                 it?.copyright = parser.nextTextTrimmed()

diff --git a/parserss/src/main/java/com/github/muhrifqii/parserss/ParsingMode.kt b/parserss/src/main/java/com/github/muhrifqii/parserss/ParsingMode.kt
@@ -113,9 +113,11 @@ sealed class ParsingMode(val nameToken: String) : ParsingModeOperation {
                 is Read -> return
                 is MediaNS.Group -> {
                     val item = modes.lastValue()
-                    if (item !is Item) throw ParseRSSException(
-                        "Error ${other.nameToken} should be under the item element",
-                    )
+                    if (item !is Item) {
+                        throw ParseRSSException(
+                            "Error ${other.nameToken} should be under the item element",
+                        )
+                    }
                     other.rssObject = item.rssObject
                 }
                 is Author -> {

diff --git a/retrofit/src/main/java/com/github/muhrifqii/parserss/retrofit/ParseRSSConverter.kt b/retrofit/src/main/java/com/github/muhrifqii/parserss/retrofit/ParseRSSConverter.kt
@@ -21,7 +21,6 @@ class ParseRSSConverterFactory<R : RSSFeed> private constructor() : Converter.Fa
         annotations: Array<Annotation>,
         retrofit: Retrofit
     ): Converter<ResponseBody, *> {
-
         return ParseRSSConverter<R>()
     }
 

diff --git a/sample/src/androidTest/java/com/github/muhrifqii/parserss/sample/ExampleInstrumentedTest.kt b/sample/src/androidTest/java/com/github/muhrifqii/parserss/sample/ExampleInstrumentedTest.kt
@@ -2,11 +2,11 @@ package com.github.muhrifqii.parserss.sample
 
 import androidx.test.InstrumentationRegistry
 import androidx.test.runner.AndroidJUnit4
+import org.junit.Assert.assertEquals
 
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
 
 /**
  * Instrumented test, which will execute on an Android device.

diff --git a/sample/src/test/java/com/github/muhrifqii/parserss/sample/ExampleUnitTest.kt b/sample/src/test/java/com/github/muhrifqii/parserss/sample/ExampleUnitTest.kt
@@ -1,9 +1,8 @@
 package com.github.muhrifqii.parserss.sample
 
+import org.junit.Assert.assertEquals
 import org.junit.Test
 
-import org.junit.Assert.*
-
 /**
  * Example local unit test, which will execute on the development machine (host).
  *