Merge pull request #40 from openapi-processor/#35

resolves #35

Author: hauner

build.gradle

@@ -20,8 +20,8 @@ java {
 }
 
 ext {
-    processorApiVersion = '1.1.0'
-    jacksonVersion = '2.11.3'
+    processorApiVersion = '1.2.0'
+    jacksonVersion = '2.12.0'
 
     bintrayUser = project.findProperty ('BINTRAY_USER') ?: System.getenv ("BINTRAY_USER") ?: 'n/a'
     bintrayKey =  project.findProperty ('BINTRAY_KEY') ?: System.getenv ("BINTRAY_KEY") ?: 'n/a'
@@ -98,13 +98,13 @@ dependencies {
     components.all(JacksonPlatformRule)
     components.all(KotlinPlatformRule)
 
-    antlr 'org.antlr:antlr4:4.8'
+    antlr 'org.antlr:antlr4:4.9'
 
     compileOnly "io.openapiprocessor:openapi-processor-api:$processorApiVersion"
     implementation "com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion"
 
     implementation 'org.openapi4j:openapi-parser:1.0.4'
-    implementation ('io.swagger.parser.v3:swagger-parser:2.0.21') {
+    implementation ('io.swagger.parser.v3:swagger-parser:2.0.23') {
         exclude group: 'io.swagger.parser.v3', module: 'swagger-parser-v2-converter'
         exclude group: 'io.swagger.core.v3', module: 'swagger-annotations'
     }
@@ -113,7 +113,7 @@ dependencies {
         exclude group: 'com.google.guava'
     }
 
-    implementation ('com.google.guava:guava:29.0-jre') {
+    implementation ('com.google.guava:guava:30.0-jre') {
         exclude group: 'com.google.guava'
         exclude group: 'com.google.j2objc'
         exclude group: 'com.google.code.findbugs'
@@ -126,7 +126,7 @@ dependencies {
     testImplementation 'org.codehaus.groovy:groovy-nio:2.5.12'
 
     testImplementation "io.openapiprocessor:openapi-processor-api:$processorApiVersion"
-    testImplementation ('io.openapiprocessor:openapi-processor-test:1.0.1') {
+    testImplementation ('io.openapiprocessor:openapi-processor-test:2020.1.0') {
         exclude group: 'com.google.guava'
     }
 
@@ -148,8 +148,8 @@ dependencies {
         exclude group: 'junit'
     }
     testImplementation("io.mockk:mockk:1.10.2")
-    testImplementation("io.kotest:kotest-runner-junit5:4.2.5")
-    testImplementation 'net.bytebuddy:byte-buddy:1.10.16'
+    testImplementation("io.kotest:kotest-runner-junit5:4.3.1")
+    testImplementation 'net.bytebuddy:byte-buddy:1.10.18'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
 }
 

src/main/kotlin/io/openapiprocessor/core/converter/ApiConverter.kt

@@ -346,7 +346,7 @@ class  ApiConverter(
         var targetInterfaceName = INTERFACE_DEFAULT_NAME
 
         if((op.hasTags())) {
-            targetInterfaceName = op.getFirstTag()!!
+            targetInterfaceName = toClass(op.getFirstTag()!!)
         }
 
         if (excluded) {

src/test/groovy/com/github/hauner/openapi/core/converter/ApiConverterSpec.groovy

@@ -74,11 +74,46 @@ paths:
             .convert (openApi)
 
         then:
-        assertInterfaces ('ping', 'pong')
+        assertInterfaces ('Ping', 'Pong')
         assertPingEndpoints ('/a', '/c')
         assertPongEndpoints ('/b')
     }
 
+    void "groups endpoints into interfaces by valid tag identifier" () {
+        def openApi = parse (
+"""\
+openapi: 3.0.2
+info:
+  title: API
+  version: 1.0.0
+
+paths:
+  /a:
+    get:
+      tags:
+        - test_api
+      responses:
+        '204':
+          description: none
+  /b:
+    get:
+      tags:
+        - test-api
+      responses:
+        '204':
+          description: none
+
+""")
+
+        when:
+        api = new ApiConverter (new ApiOptions(), Stub (Framework))
+            .convert (openApi)
+
+        then:
+        def actual = api.interfaces
+        assert actual.size () == 1
+        assert actual.first ().name == "TestApi"
+    }
 
     @Unroll
     void "groups endpoints with method #method into interfaces" () {
@@ -119,7 +154,7 @@ paths:
         w.write (writer, api.interfaces.get (0))
 
         then:
-        assertInterfaces (method)
+        assertInterfaces (method.capitalize ())
         assertEndpoints (method,'/a')
 
         where: