Merge pull request #86 from macisamuele/maci-pre-commit-hooks-and-sam…

…ples-update

Pre commit hooks and Samples update

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v2.1.0
+  rev: v2.4.0
   hooks:
   - id: check-merge-conflict
   - id: trailing-whitespace
@@ -12,16 +12,17 @@ repos:
   - id: check-yaml
   - id: check-executables-have-shebangs
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v1.2.3
+  rev: v1.3.2
   hooks:
   - id: pretty-format-java
     args: [--autofix]
   - id: pretty-format-kotlin
     args: [--autofix]
   - id: pretty-format-yaml
     args: [--autofix, --indent, '2']
+    exclude: ^config/detekt/detekt\.yml$
 - repo: https://github.com/Yelp/detect-secrets
-  rev: v0.12.0
+  rev: v0.13.0
   hooks:
   - id: detect-secrets
     args: [--baseline, .secrets.baseline]

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": null,
     "lines": null
   },
-  "generated_at": "2019-02-14T20:34:51Z",
+  "generated_at": "2020-01-26T21:34:12Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -20,6 +20,7 @@
       "name": "HexHighEntropyString"
     },
     {
+      "keyword_exclude": null,
       "name": "KeywordDetector"
     },
     {
@@ -30,10 +31,15 @@
     "gradle.properties.example": [
       {
         "hashed_secret": "6f9583b0d701174f6b64698f940f9e1470612638",
+        "is_verified": false,
         "line_number": 2,
         "type": "Secret Keyword"
       }
     ]
   },
-  "version": "0.12.0"
+  "version": "0.13.0",
+  "word_list": {
+    "file": null,
+    "hash": null
+  }
 }

.travis.yml

@@ -24,9 +24,5 @@ cache:
   - ${HOME}/.m2
 
 script:
-- ./gradlew plugin:build
-- ./gradlew plugin:publishToMavenLocal
-- ./gradlew generateSwagger
-- ./gradlew assembleDebug
-- ./gradlew check
+- make test
 - bash <(curl -s https://codecov.io/bash)

Makefile

@@ -1,11 +1,23 @@
-.PHONY: install-hooks
+.PHONY: install-hooks regenerate-samples test
 
 .git/hooks/pre-commit: venv
 	${CURDIR}/venv/bin/pre-commit install --install-hooks
 
 install-hooks: .git/hooks/pre-commit
 	@true
 
+regenerate-samples:
+	${CURDIR}/gradlew plugin:build
+	${CURDIR}/gradlew plugin:publishToMavenLocal
+	${CURDIR}/gradlew generateSwagger
+
+test:
+	${CURDIR}/gradlew plugin:build
+	${CURDIR}/gradlew plugin:publishToMavenLocal
+	${CURDIR}/gradlew generateSwagger
+	${CURDIR}/gradlew assembleDebug
+	${CURDIR}/gradlew check
+
 venv:
 	virtualenv venv
 	./venv/bin/pip install pre-commit

plugin/src/main/java/com/yelp/codegen/Main.kt

@@ -7,12 +7,12 @@ import io.swagger.codegen.DefaultGenerator
 import io.swagger.codegen.config.CodegenConfigurator
 import io.swagger.parser.SwaggerParser
 import io.swagger.util.Json
+import java.io.File
 import org.apache.commons.cli.CommandLine
 import org.apache.commons.cli.CommandLineParser
 import org.apache.commons.cli.DefaultParser
 import org.apache.commons.cli.Option
 import org.apache.commons.cli.Options
-import java.io.File
 
 fun main(args: Array<String>) {
     val options = Options()

plugin/src/main/java/com/yelp/codegen/plugin/GenerateTask.kt

@@ -2,6 +2,7 @@ package com.yelp.codegen.plugin
 
 import com.yelp.codegen.main
 import io.swagger.parser.SwaggerParser
+import java.io.File
 import org.gradle.api.DefaultTask
 import org.gradle.api.plugins.BasePlugin
 import org.gradle.api.tasks.Input
@@ -12,7 +13,6 @@ import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.options.Option
-import java.io.File
 
 const val DEFAULT_PLATFORM = "kotlin"
 const val DEFAULT_VERSION = "0.0.0"

plugin/src/main/java/com/yelp/codegen/plugin/GenerateTaskConfiguration.kt

@@ -1,8 +1,8 @@
 package com.yelp.codegen.plugin
 
+import java.io.File
 import org.gradle.api.Action
 import org.gradle.api.Project
-import java.io.File
 
 open class GenerateTaskConfiguration(@Suppress("UNUSED_PARAMETER") project: Project) {
     var platform: String? = null

plugin/src/test/java/com/yelp/codegen/KotlinGeneratorTest.kt

@@ -7,12 +7,12 @@ import io.swagger.codegen.CodegenProperty
 import io.swagger.models.Info
 import io.swagger.models.Operation
 import io.swagger.models.Swagger
+import java.io.File
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import java.io.File
 
 class KotlinGeneratorTest {
 

samples/junit-tests/.gitignore

@@ -1 +1,2 @@
-/src/main/java
+/src/main/java/.swagger-codegen
+/src/main/java/.swagger-codegen-ignore

samples/junit-tests/src/main/java/com/yelp/codegen/generatecodesamples/tools/CollectionFormatConverterFactory.kt

@@ -1,8 +1,8 @@
 package com.yelp.codegen.generatecodesamples.tools
 
+import java.lang.reflect.Type
 import retrofit2.Converter
 import retrofit2.Retrofit
-import java.lang.reflect.Type
 
 internal class CollectionFormatConverterFactory : Converter.Factory() {
 

samples/junit-tests/src/main/java/com/yelp/codegen/generatecodesamples/tools/EnumToValueConverterFactory.kt

@@ -1,9 +1,9 @@
 package com.yelp.codegen.generatecodesamples.tools
 
 import com.squareup.moshi.Json
+import java.lang.reflect.Type
 import retrofit2.Converter
 import retrofit2.Retrofit
-import java.lang.reflect.Type
 
 internal class EnumToValueConverterFactory : Converter.Factory() {
 

samples/junit-tests/src/main/java/com/yelp/codegen/generatecodesamples/tools/TypesAdapters.kt

@@ -5,14 +5,14 @@ import com.squareup.moshi.JsonReader
 import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.internal.Util
+import java.lang.reflect.Type
+import java.math.BigDecimal
+import org.threeten.bp.DateTimeException
 import org.threeten.bp.LocalDate
-import org.threeten.bp.ZonedDateTime
 import org.threeten.bp.LocalDateTime
-import org.threeten.bp.DateTimeException
 import org.threeten.bp.ZoneId
+import org.threeten.bp.ZonedDateTime
 import org.threeten.bp.format.DateTimeFormatter
-import java.lang.reflect.Type
-import java.math.BigDecimal
 
 /**
  * Moshi Factory to handle all the custom types we want to support,

samples/junit-tests/src/main/java/com/yelp/codegen/generatecodesamples/tools/WrapperConverterFactory.kt

@@ -1,10 +1,10 @@
 package com.yelp.codegen.generatecodesamples.tools
 
+import java.lang.reflect.Type
 import okhttp3.RequestBody
 import okhttp3.ResponseBody
 import retrofit2.Converter
 import retrofit2.Retrofit
-import java.lang.reflect.Type
 
 internal class WrapperConverterFactory(private vararg val factories: Converter.Factory) : Converter.Factory() {
 

samples/junit-tests/src/test/java/com/yelp/codegen/generatecodesamples/FormatEndpointTest.kt

@@ -8,8 +8,8 @@ import org.junit.Assert.assertEquals
 import org.junit.Rule
 import org.junit.Test
 import org.threeten.bp.LocalDate
-import org.threeten.bp.ZonedDateTime
 import org.threeten.bp.ZoneId
+import org.threeten.bp.ZonedDateTime
 
 class FormatEndpointTest {
 

samples/junit-tests/src/test/java/com/yelp/codegen/generatecodesamples/NestedAdditionalPropertiesCustomDescriptionTest.kt

@@ -5,8 +5,8 @@ import com.yelp.codegen.generatecodesamples.models.TopLevelMap
 import com.yelp.codegen.generatecodesamples.tools.MockServerApiRule
 import okhttp3.mockwebserver.MockResponse
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
 import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test
 

samples/junit-tests/src/test/java/com/yelp/codegen/generatecodesamples/NestedAdditionalPropertiesEndpointTest.kt

@@ -5,8 +5,8 @@ import com.yelp.codegen.generatecodesamples.models.TopLevelMap
 import com.yelp.codegen.generatecodesamples.tools.MockServerApiRule
 import okhttp3.mockwebserver.MockResponse
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
 import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test
 

samples/junit-tests/src/test/java/com/yelp/codegen/generatecodesamples/PropertyArrayEndpointTest.kt

@@ -3,10 +3,10 @@ package com.yelp.codegen.generatecodesamples
 import com.yelp.codegen.generatecodesamples.apis.ResourceApi
 import com.yelp.codegen.generatecodesamples.tools.MockServerApiRule
 import okhttp3.mockwebserver.MockResponse
+import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
-import org.junit.Assert.assertEquals
 import org.junit.Rule
 import org.junit.Test
 

samples/junit-tests/src/test/java/com/yelp/codegen/generatecodesamples/PropertyMapEndpointTest.kt

@@ -3,13 +3,12 @@ package com.yelp.codegen.generatecodesamples
 import com.yelp.codegen.generatecodesamples.apis.ResourceApi
 import com.yelp.codegen.generatecodesamples.tools.MockServerApiRule
 import okhttp3.mockwebserver.MockResponse
-import org.junit.Assert.assertNull
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertEquals
 import org.junit.Rule
-
 import org.junit.Test
 
 class PropertyMapEndpointTest {

samples/junit-tests/src/test/java/com/yelp/codegen/generatecodesamples/TopLevelMapEndpointTest.kt

@@ -3,8 +3,8 @@ package com.yelp.codegen.generatecodesamples
 import com.yelp.codegen.generatecodesamples.apis.ResourceApi
 import com.yelp.codegen.generatecodesamples.tools.MockServerApiRule
 import okhttp3.mockwebserver.MockResponse
-import org.junit.Assert.assertTrue
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test
 

samples/junit-tests/src/test/java/com/yelp/codegen/generatecodesamples/xnullable/XnullableNestedAdditionalPropertiesEndpointTest.kt

@@ -5,9 +5,9 @@ import com.yelp.codegen.generatecodesamples.models.XnullableMap
 import com.yelp.codegen.generatecodesamples.tools.MockServerApiRule
 import okhttp3.mockwebserver.MockResponse
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test
 

samples/junit-tests/src/test/java/com/yelp/codegen/generatecodesamples/xnullable/XnullablePropertyArrayEndpointTest.kt

@@ -4,9 +4,9 @@ import com.yelp.codegen.generatecodesamples.apis.XnullableApi
 import com.yelp.codegen.generatecodesamples.tools.MockServerApiRule
 import okhttp3.mockwebserver.MockResponse
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Assert.assertNull
 import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test
 

samples/junit-tests/src/test/java/com/yelp/codegen/generatecodesamples/xnullable/XnullableRequiredPropertyArrayEndpointTest.kt

@@ -4,9 +4,9 @@ import com.yelp.codegen.generatecodesamples.apis.XnullableApi
 import com.yelp.codegen.generatecodesamples.tools.MockServerApiRule
 import okhttp3.mockwebserver.MockResponse
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Assert.assertNull
 import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test
 

samples/kotlin-coroutines/src/test/java/com/yelp/codegen/samples/kotlincoroutines/CoroutinesEndpointsTest.kt

@@ -6,7 +6,9 @@ import com.yelp.codegen.samples.kotlincoroutines.tools.CoroutineDispatcherRule
 import com.yelp.codegen.samples.kotlincoroutines.tools.MockServerApiRule
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import okhttp3.mockwebserver.MockResponse
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
 import org.junit.Rule
 import org.junit.Test
 

samples/kotlin-coroutines/src/test/java/com/yelp/codegen/samples/kotlincoroutines/tools/CoroutineDispatcherRule.kt

@@ -34,5 +34,4 @@ class CoroutineDispatcherRule : ExternalResource() {
 
     fun runBlockingTest(block: suspend CoroutineScope.() -> Unit) =
             runBlocking(Dispatchers.Main, block)
-
 }