Merge pull request #44 from Yelp/configure-detekt

Configure Detekt
Yelp · Jul 10, 2019 · 55f6c88 · 55f6c88
2 parents 49822a4 + cf399c2
commit 55f6c88
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 14 deletions.
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -9,6 +9,7 @@ plugins {
     `maven-publish`
     kotlin("jvm") version "1.3.41"
     id("com.gradle.plugin-publish") version "0.10.0"
+    id("io.gitlab.arturbosch.detekt") version "1.0.0-RC16"
 }
 
 java {
@@ -46,3 +47,11 @@ pluginBundle {
         }
     }
 }
+
+detekt {
+    toolVersion = "1.0.0-RC16"
+    input = files("src/main")
+    config = files("./detekt-config.yml")
+    buildUponDefaultConfig = true
+    filters = ".*/resources/.*,.*/build/.*"
+}
diff --git a/plugin/detekt-config.yml b/plugin/detekt-config.yml
@@ -0,0 +1,19 @@
+build:
+  maxIssues: 1
+
+complexity:
+  active: true
+  ComplexMethod:
+    active: true
+    threshold: 20
+    ignoreSingleWhenExpression: false
+    ignoreSimpleWhenEntries: false
+
+
+style:
+  active: true
+  ReturnCount:
+    active: true
+    max: 3
+    excludeLabeled: false
+    excludeReturnFromLambda: true
diff --git a/plugin/src/main/java/com/yelp/codegen/KotlinGenerator.kt b/plugin/src/main/java/com/yelp/codegen/KotlinGenerator.kt
@@ -1,4 +1,4 @@
-@file:Suppress("NOTHING_TO_INLINE")
+@file:Suppress("TooManyFunctions", "NOTHING_TO_INLINE")
 
 package com.yelp.codegen
 

diff --git a/plugin/src/main/java/com/yelp/codegen/SharedCodegen.kt b/plugin/src/main/java/com/yelp/codegen/SharedCodegen.kt
@@ -1,3 +1,5 @@
+@file:Suppress("TooManyFunctions")
+
 package com.yelp.codegen
 
 import com.yelp.codegen.utils.InlineModelResolver
@@ -130,8 +132,8 @@ abstract class SharedCodegen : DefaultCodegen(), CodegenConfig {
      */
     fun matchXModel(name: String): String {
         return xModelMatches[name] ?: (
-            this.swagger?.definitions?.get(name)?.title ?: name
-        )
+                this.swagger?.definitions?.get(name)?.title ?: name
+                )
     }
 
     /**
@@ -322,16 +324,12 @@ abstract class SharedCodegen : DefaultCodegen(), CodegenConfig {
      * Header Interceptor) and is helpful to remove the header from the endpoints to avoid confusion.
      */
     protected fun getHeadersToIgnore(): List<String> {
-        return try {
-            val headerList = mutableListOf<String>()
-            val headerParam = additionalProperties[HEADERS_TO_IGNORE] as? String
-            if (headerParam != null) {
-                headerList.addAll(headerParam.split(','))
-            }
-            headerList.toList()
-        } catch (e: Throwable) {
-            listOf()
+        val headerList = mutableListOf<String>()
+        val headerParam = additionalProperties[HEADERS_TO_IGNORE] as? String
+        if (headerParam != null) {
+            headerList.addAll(headerParam.split(','))
         }
+        return headerList.toList()
     }
 
     /**

diff --git a/.../com/yelp/codegen/plugin/CodegenPlugin.kt → ...a/com/yelp/codegen/plugin/GenerateTask.kt b/.../com/yelp/codegen/plugin/CodegenPlugin.kt → ...a/com/yelp/codegen/plugin/GenerateTask.kt
@@ -58,7 +58,8 @@ open class GenerateTask : DefaultTask() {
 
     @InputFiles
     @Optional
-    @Option(option = "extraFiles", description = "Configures path of the extra files directory to be added to the Generated code.")
+    @Option(option = "extraFiles",
+            description = "Configures path of the extra files directory to be added to the Generated code.")
     var extraFiles: File? = null
 
     @Nested

diff --git a/samples/junit-tests/build.gradle b/samples/junit-tests/build.gradle
@@ -11,12 +11,14 @@ buildscript {
         classpath "com.android.tools.build:gradle:3.4.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.41"
         classpath "com.yelp.codegen:plugin:1.1.1"
+        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0-RC16"
     }
 }
 
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
 apply plugin: "com.yelp.codegen.plugin"
+apply plugin: "io.gitlab.arturbosch.detekt"
 
 android {
     compileSdkVersion = 28
@@ -65,3 +67,9 @@ generateSwagger {
 repositories {
     mavenCentral()
 }
+
+detekt {
+    toolVersion = "1.0.0-RC16"
+    input = files("src/test")
+    filters = ".*/resources/.*,.*/build/.*"
+}
diff --git a/samples/junit-tests/src/test/java/com/yelp/codegen/generatecodesamples/FormatEndpointTest.kt b/samples/junit-tests/src/test/java/com/yelp/codegen/generatecodesamples/FormatEndpointTest.kt
@@ -73,7 +73,8 @@ class FormatEndpointTest {
         """.trimIndent()))
 
         // 10000000 nanoseconds == 0.01 seconds.
-        val returned = rule.getApi<ResourceApi>().getFormatEndpoint("datetime_with_fractionalsec_and_timezone").blockingGet()
+        val returned = rule.getApi<ResourceApi>()
+                .getFormatEndpoint("datetime_with_fractionalsec_and_timezone").blockingGet()
         assertEquals(ZonedDateTime.of(1970, 1, 1, 0, 0, 0, 10000000, ZoneId.of("+01:00")), returned.datetimeProperty)
     }