Minor cleanup as follow-up to #135 (#136)

* use regex to extract parameters from path in OpenApi 2.0 generator

* use regex to extract parameters from path in OpenApi 3.0 generator

* fixed typo in multi param test in OpenAPI 2.0 generator
added OpenAPI 3.0 multi param test

* fix typo

* Cleanup unneeded setup data and empty line

* Cleanup import and whitespace

* Fix whitespace and lint

* Lint fix

Co-authored-by: Sushruth Godugunuari <[email protected]>
Co-authored-by: ooz <[email protected]>

Author: 3 people

restdocs-api-spec-openapi-generator/src/main/kotlin/com/epages/restdocs/apispec/openapi2/OpenApi20Generator.kt

@@ -8,9 +8,9 @@ import com.epages.restdocs.apispec.model.Oauth2Configuration
 import com.epages.restdocs.apispec.model.ParameterDescriptor
 import com.epages.restdocs.apispec.model.ResourceModel
 import com.epages.restdocs.apispec.model.ResponseModel
+import com.epages.restdocs.apispec.model.Schema
 import com.epages.restdocs.apispec.model.SecurityRequirements
 import com.epages.restdocs.apispec.model.SecurityType
-import com.epages.restdocs.apispec.model.Schema
 import com.fasterxml.jackson.module.kotlin.readValue
 import io.swagger.models.Info
 import io.swagger.models.Model
@@ -34,7 +34,6 @@ import io.swagger.models.properties.PropertyBuilder
 import io.swagger.util.Json
 import java.util.Comparator.comparing
 import java.util.Comparator.comparingInt
-import java.util.regex.Pattern
 
 object OpenApi20Generator {
 
@@ -325,7 +324,7 @@ object OpenApi20Generator {
 
     private fun extractPathParameters(resourceModel: ResourceModel): List<PathParameter> {
         val pathParameterNames = PATH_PARAMETER_PATTERN.findAll(resourceModel.request.path)
-                .map { matchResult -> matchResult.groupValues[1]  }
+                .map { matchResult -> matchResult.groupValues[1] }
                 .toList()
 
         return pathParameterNames.map { parameterName ->

restdocs-api-spec-openapi3-generator/src/main/kotlin/com/epages/restdocs/apispec/openapi3/OpenApi3Generator.kt

@@ -346,7 +346,7 @@ object OpenApi3Generator {
 
     private fun extractPathParameters(resourceModel: ResourceModel): List<PathParameter> {
         val pathParameterNames = PATH_PARAMETER_PATTERN.findAll(resourceModel.request.path)
-                .map { matchResult -> matchResult.groupValues[1]  }
+                .map { matchResult -> matchResult.groupValues[1] }
                 .toList()
 
         return pathParameterNames.map { parameterName ->

restdocs-api-spec-openapi3-generator/src/test/kotlin/com/epages/restdocs/apispec/openapi3/OpenApi3GeneratorTest.kt

@@ -1,5 +1,6 @@
 package com.epages.restdocs.apispec.openapi3
 
+import com.epages.restdocs.apispec.model.Attributes
 import com.epages.restdocs.apispec.model.FieldDescriptor
 import com.epages.restdocs.apispec.model.HTTPMethod
 import com.epages.restdocs.apispec.model.HeaderDescriptor
@@ -8,10 +9,9 @@ import com.epages.restdocs.apispec.model.ParameterDescriptor
 import com.epages.restdocs.apispec.model.RequestModel
 import com.epages.restdocs.apispec.model.ResourceModel
 import com.epages.restdocs.apispec.model.ResponseModel
+import com.epages.restdocs.apispec.model.Schema
 import com.epages.restdocs.apispec.model.SecurityRequirements
 import com.epages.restdocs.apispec.model.SecurityType
-import com.epages.restdocs.apispec.model.Schema
-import com.epages.restdocs.apispec.model.Attributes
 import com.jayway.jsonpath.Configuration
 import com.jayway.jsonpath.DocumentContext
 import com.jayway.jsonpath.JsonPath
@@ -178,13 +178,12 @@ class OpenApi3GeneratorTest {
     }
 
     @Test
-    fun `should extract multiple parameters when seperated by delimiter`(){
+    fun `should extract multiple parameters when seperated by delimiter`() {
         givenResourceWithMultiplePathParameters()
 
         whenOpenApiObjectGenerated()
 
         thenMultiplePathParametersExist()
-
     }
 
     fun thenGetProductByIdOperationIsValid() {
@@ -719,30 +718,14 @@ class OpenApi3GeneratorTest {
         )
     }
 
-    private fun getProductRequestWithMultiplePathParameters (getSecurityRequirement: () -> SecurityRequirements = ::getOAuth2SecurityRequirement): RequestModel {
+    private fun getProductRequestWithMultiplePathParameters(getSecurityRequirement: () -> SecurityRequirements = ::getOAuth2SecurityRequirement): RequestModel {
         return RequestModel(
                 path = "/products/{id}-{subId}",
                 method = HTTPMethod.GET,
                 securityRequirements = getSecurityRequirement(),
-                headers = listOf(
-                        HeaderDescriptor(
-                                name = "Authorization",
-                                description = "Access token",
-                                type = "string",
-                                optional = false,
-                                example = "some example"
-                        )
-                ),
+                headers = emptyList(),
                 pathParameters = emptyList(),
-                requestParameters = listOf(
-                        ParameterDescriptor(
-                                name = "locale",
-                                description = "Localizes the product fields to the given locale code",
-                                type = "STRING",
-                                optional = true,
-                                ignored = false
-                        )
-                ),
+                requestParameters = emptyList(),
                 requestFields = listOf()
         )
     }