revert swagger validator test dependency upgrade

Author: Brendan Doyle

tests/build.gradle

@@ -225,7 +225,7 @@ dependencies {
     implementation "org.mockito:mockito-core:2.27.0"
     implementation "io.opentracing:opentracing-mock:0.31.0"
     implementation "org.apache.curator:curator-test:${gradle.curator.version}"
-    implementation "com.atlassian.oai:swagger-request-validator-core:2.20.0"
+    implementation "com.atlassian.oai:swagger-request-validator-core:1.4.5"
     implementation "io.github.embeddedkafka:embedded-kafka_${gradle.scala.depVersion}:2.4.0"
     implementation "com.typesafe.akka:akka-stream-kafka-testkit_${gradle.scala.depVersion}:${gradle.akka_kafka.version}"
     implementation "com.typesafe.akka:akka-stream-testkit_${gradle.scala.depVersion}:${gradle.akka.version}"
@@ -245,7 +245,7 @@ dependencies {
     implementation project(':core:monitoring:user-events')
     implementation project(':tools:admin')
 
-    swaggerCodegen 'io.swagger:swagger-codegen-cli:2.4.29'
+    swaggerCodegen 'io.swagger:swagger-codegen-cli:2.4.9'
 }
 
 def keystorePath = new File(sourceSets.test.scala.outputDir, 'keystore')

tests/src/test/scala/common/rest/SwaggerValidator.scala

@@ -18,9 +18,11 @@
 package common.rest
 
 import scala.collection.JavaConverters._
+
 import akka.http.scaladsl.model.HttpEntity
 import akka.http.scaladsl.model.HttpRequest
 import akka.http.scaladsl.model.HttpResponse
+import com.atlassian.oai.validator.SwaggerRequestResponseValidator
 import com.atlassian.oai.validator.model.SimpleRequest
 import com.atlassian.oai.validator.model.SimpleResponse
 import com.atlassian.oai.validator.report.ValidationReport
@@ -36,27 +38,27 @@ trait SwaggerValidator {
     .withRule(
       "Ignore action and trigger payloads",
       WhitelistRules.allOf(
-        WhitelistRules.messageContainsSubstring("Object instance has properties which are not allowed by the schema"),
+        WhitelistRules.messageContains("Object instance has properties which are not allowed by the schema"),
         WhitelistRules.anyOf(
-          WhitelistRules.pathContainsSubstring("/web/"),
-          WhitelistRules.pathContainsSubstring("/actions/"),
-          WhitelistRules.pathContainsSubstring("/triggers/")),
-        WhitelistRules.methodIs(io.swagger.v3.oas.models.PathItem.HttpMethod.POST)))
+          WhitelistRules.pathContains("/web/"),
+          WhitelistRules.pathContains("/actions/"),
+          WhitelistRules.pathContains("/triggers/")),
+        WhitelistRules.methodIs(io.swagger.models.HttpMethod.POST)))
     .withRule(
       "Ignore invalid action kinds",
       WhitelistRules.allOf(
-        WhitelistRules.messageContainsSubstring("kind"),
-        WhitelistRules.messageContainsSubstring("Instance value"),
-        WhitelistRules.messageContainsSubstring("not found"),
-        WhitelistRules.pathContainsSubstring("/actions/"),
-        WhitelistRules.methodIs(io.swagger.v3.oas.models.PathItem.HttpMethod.PUT)))
+        WhitelistRules.messageContains("kind"),
+        WhitelistRules.messageContains("Instance value"),
+        WhitelistRules.messageContains("not found"),
+        WhitelistRules.pathContains("/actions/"),
+        WhitelistRules.methodIs(io.swagger.models.HttpMethod.POST)))
     .withRule(
       "Ignore tests that check for invalid DELETEs and PUTs on actions",
       WhitelistRules.anyOf(
-        WhitelistRules.messageContainsSubstring("DELETE operation not allowed on path '/api/v1/namespaces/_/actions/'"),
-        WhitelistRules.messageContainsSubstring("PUT operation not allowed on path '/api/v1/namespaces/_/actions/'")))
+        WhitelistRules.messageContains("DELETE operation not allowed on path '/api/v1/namespaces/_/actions/'"),
+        WhitelistRules.messageContains("PUT operation not allowed on path '/api/v1/namespaces/_/actions/'")))
 
-  private val specValidator = com.atlassian.oai.validator.SwaggerRequestResponseValidator
+  private val specValidator = SwaggerRequestResponseValidator
     .createFor("apiv1swagger.json")
     .withWhitelist(specWhitelist)
     .build()