Merge pull request #362 from h2oai/update-swagger-v2-support-openapi3

Update swagger API v1 using OPENAPI spec 3.0
h2oai · Jun 14, 2023 · 3fe42f9 · 3fe42f9
2 parents 724e22b + 9c01c0f
commit 3fe42f9
Show file tree

Hide file tree

Showing 19 changed files with 657 additions and 175 deletions.
diff --git a/aws-lambda-scorer/lambda-template/build.gradle b/aws-lambda-scorer/lambda-template/build.gradle
@@ -5,10 +5,6 @@ dependencies {
     implementation project(':common:transform')
     implementation group: 'ai.h2o', name: 'mojo2-runtime-api'
     implementation group: 'ai.h2o', name: 'mojo2-runtime-impl'
-    constraints {
-        // because https://app.snyk.io/vuln/SNYK-JAVA-COMMONSBEANUTILS-460111
-        compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
-    }
     implementation group: 'com.amazonaws', name: 'aws-lambda-java-core'
     implementation group: 'com.amazonaws', name: 'aws-lambda-java-events'
     implementation group: 'com.amazonaws', name: 'aws-java-sdk-s3'

diff --git a/aws-sagemaker-hosted-scorer/build.gradle b/aws-sagemaker-hosted-scorer/build.gradle
@@ -9,10 +9,6 @@ dependencies {
     implementation project(':common:transform')
     implementation group: 'ai.h2o', name: 'mojo2-runtime-api'
     implementation group: 'ai.h2o', name: 'mojo2-runtime-impl'
-    constraints {
-        // because https://app.snyk.io/vuln/SNYK-JAVA-COMMONSBEANUTILS-460111
-        compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
-    }
     implementation group: 'io.springfox', name: 'springfox-boot-starter', version: springFoxVersion
     implementation group: 'com.google.guava', name: 'guava', version: guavaVersion
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'

diff --git a/common/jdbc/build.gradle b/common/jdbc/build.gradle
@@ -9,10 +9,6 @@ dependencies {
     implementation project(':common:rest-jdbc-spring-api')
     implementation group: 'ai.h2o', name: 'mojo2-runtime-api'
     implementation group: 'ai.h2o', name: 'mojo2-runtime-impl'
-    constraints {
-        // because https://app.snyk.io/vuln/SNYK-JAVA-COMMONSBEANUTILS-460111
-        compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
-    }
     implementation group: 'ai.h2o', name: 'sparkling-water-scoring_2.12'
     implementation group: 'org.scala-lang', name: 'scala-library'
     implementation group: 'org.apache.spark', name: 'spark-core_2.12'

diff --git a/common/rest-java-model/build.gradle b/common/rest-java-model/build.gradle
@@ -20,7 +20,16 @@ swaggerSources {
             dependsOn validation
         }
     }
+    modelV1Exp {
+        inputFile = file('../swagger/v1exp/swagger.yaml')
+        code {
+            language = 'java'
+            configFile = file('../swagger/v1exp/swagger_codegen.json')
+            components = [models: true]
+            dependsOn validation
+        }
+    }
 }
 
-compileJava.dependsOn swaggerSources.model.code
-sourceSets.main.java.srcDir "${swaggerSources.model.code.outputDir}/src/main/java"
+compileJava.dependsOn swaggerSources.model.code, swaggerSources.modelV1Exp.code
+sourceSets.main.java.srcDirs "${swaggerSources.model.code.outputDir}/src/main/java", "${swaggerSources.modelV1Exp.code.outputDir}/src/main/java"
diff --git a/common/rest-jdbc-spring-api/build.gradle b/common/rest-jdbc-spring-api/build.gradle
@@ -5,7 +5,7 @@ plugins {
 apply from: project(":").file('gradle/java.gradle')
 
 dependencies {
-    implementation group: 'io.swagger', name: 'swagger-annotations'
+    implementation group: 'io.swagger.core.v3', name: 'swagger-annotations'
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation'
     swaggerCodegen group: 'io.swagger.codegen.v3', name: 'swagger-codegen-cli'

diff --git a/common/rest-spring-api/build.gradle b/common/rest-spring-api/build.gradle
@@ -5,7 +5,7 @@ plugins {
 apply from: project(":").file('gradle/java.gradle')
 
 dependencies {
-    implementation group: 'io.swagger', name: 'swagger-annotations'
+    implementation group: 'io.swagger.core.v3', name: 'swagger-annotations'
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation'
     swaggerCodegen group: 'io.swagger.codegen.v3', name: 'swagger-codegen-cli'
@@ -21,6 +21,15 @@ swaggerSources {
             dependsOn validation
         }
     }
+    apiV1Exp {
+        inputFile = file('../swagger/v1exp/swagger.yaml')
+        code {
+            language = 'spring'
+            configFile = file('../swagger/v1exp/swagger_codegen.json')
+            components = [models: true, apis: true]
+            dependsOn validation
+        }
+    }
 }
 
 jar {
@@ -32,5 +41,5 @@ bootJar {
     enabled=false
 }
 
-compileJava.dependsOn swaggerSources.api.code
-sourceSets.main.java.srcDir "${swaggerSources.api.code.outputDir}/src/main/java"
+compileJava.dependsOn swaggerSources.api.code, swaggerSources.apiV1Exp.code
+sourceSets.main.java.srcDirs "${swaggerSources.api.code.outputDir}/src/main/java", "${swaggerSources.apiV1Exp.code.outputDir}/src/main/java"
diff --git a/common/rest-vertex-ai-spring-api/build.gradle b/common/rest-vertex-ai-spring-api/build.gradle
@@ -5,7 +5,7 @@ plugins {
 apply from: project(":").file('gradle/java.gradle')
 
 dependencies {
-    implementation group: 'io.swagger', name: 'swagger-annotations'
+    implementation group: 'io.swagger.core.v3', name: 'swagger-annotations'
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation'
     swaggerCodegen group: 'io.swagger.codegen.v3', name: 'swagger-codegen-cli'

diff --git a/common/swagger/v1exp/swagger.yaml b/common/swagger/v1exp/swagger.yaml
@@ -26,15 +26,15 @@ paths:
             schema:
               type: object
               properties:
-                mediaScoreRequest:
-                  $ref: '#/components/schemas/MediaScoreRequest'
+                scoreMediaRequest:
+                  $ref: '#/components/schemas/scoreMediaRequest'
                 files:
                   type: array
                   items:
                     type: string
                     format: binary
               required:
-                - mediaScoreRequest
+                - scoreMediaRequest
                 - files
       responses:
         '200':
@@ -49,7 +49,7 @@ paths:
           description: Invalid payload
 components:
   schemas:
-    MediaScoreRequest:
+    scoreMediaRequest:
       allOf:
         - $ref: '../v1/swagger.yaml#/definitions/ScoreRequest'
         - properties: