Revert "FDN-4939: Add OpenAPI 3.x import support"

api/app/lib/OriginalUtil.scala

@@ -31,8 +31,6 @@ object OriginalUtil {
           Some(OriginalType.ApiJson)
         } else if (o.asOpt[Service].isDefined) {
           Some(OriginalType.ServiceJson)
-        } else if ((o \ "openapi").asOpt[JsString].exists(_.value.startsWith("3."))) {
-          Some(OriginalType.UNDEFINED("open_api_3"))
         } else if ((o \ "swagger").asOpt[JsString].isDefined) {
           Some(OriginalType.Swagger)
         } else {
@@ -42,8 +40,6 @@ object OriginalUtil {
       case _ => {
         if (trimmed.indexOf("protocol ") >= 0 || trimmed.indexOf("@namespace") >= 0) {
           Some(OriginalType.AvroIdl)
-        } else if (isOpenApi3Yaml(trimmed)) {
-          Some(OriginalType.UNDEFINED("open_api_3"))
         } else if (trimmed.contains("swagger:")) {
           Some(OriginalType.Swagger)
         } else {
@@ -53,11 +49,6 @@ object OriginalUtil {
     }
   }
 
-  private val OpenApi3YamlPattern = """(?m)^openapi:\s*["']?3\.""".r
-
-  private def isOpenApi3Yaml(data: String): Boolean =
-    OpenApi3YamlPattern.findFirstIn(data).isDefined
-
   private def guessApiOrServiceJson(o: JsObject): Option[OriginalType] = {
     // service.json has these defined as array; api.json as maps
     val fields = Seq("enums", "interfaces", "unions", "models")

build.sbt

@@ -61,32 +61,12 @@ lazy val swagger = project
     )
   )
 
-lazy val openapi = project
-  .in(file("openapi"))
-  .dependsOn(lib % "compile->compile;test->test")
-  .aggregate(lib)
-  .settings(
-    scalacOptions ++= allScalacOptions,
-    resolvers += "jitpack" at "https://jitpack.io",
-    libraryDependencies ++= Seq(
-      "com.softwaremill.sttp.apispec" %% "openapi-model" % "0.11.10",
-      "com.softwaremill.sttp.apispec" %% "openapi-circe" % "0.11.10",
-      "com.softwaremill.sttp.apispec" %% "openapi-circe-yaml" % "0.11.10",
-      "com.github.apicollective" % "apibuilder-validation" % "0.5.8",
-      "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test,
-    ),
-    Test / javaOptions ++= Seq(
-      "--add-exports=java.base/sun.security.x509=ALL-UNNAMED",
-      "--add-opens=java.base/sun.security.ssl=ALL-UNNAMED"
-    )
-  )
-
 val circeVersion = "0.14.9"
 lazy val core = project
   .in(file("core"))
   .enablePlugins(PlayScala)
-  .dependsOn(generated, lib, avro, swagger, openapi)
-  .aggregate(generated, lib, avro, swagger, openapi)
+  .dependsOn(generated, lib, avro, swagger)
+  .aggregate(generated, lib, avro, swagger)
   .settings(commonSettings*)
   .settings(
     libraryDependencies ++= Seq(

core/app/builder/OriginalValidator.scala

@@ -5,7 +5,6 @@ import cats.data.ValidatedNec
 import core.{ServiceFetcher, VersionMigration}
 import io.apibuilder.api.v0.models.OriginalType
 import io.apibuilder.avro.AvroIdlServiceValidator
-import io.apibuilder.openapi.OpenApiServiceValidator
 import io.apibuilder.spec.v0.models.Service
 import io.apibuilder.swagger.SwaggerServiceValidator
 import lib.{ServiceConfiguration, ServiceValidator}
@@ -24,7 +23,6 @@ object OriginalValidator {
       case OriginalType.ServiceJson => ServiceJsonServiceValidator
       case OriginalType.Swagger => SwaggerServiceValidator(config)
       case OriginalType.UNDEFINED("swagger_json") => SwaggerServiceValidator(config)
-      case OriginalType.UNDEFINED("open_api_3") => OpenApiServiceValidator(config)
       case OriginalType.UNDEFINED(other) => sys.error(s"Invalid original type[$other]")
     }
     WithServiceSpecValidator(validator)