W-14931493 - Exposed internal Async plugin

amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/Async20ParsePlugin.scala

@@ -1,21 +1,8 @@
 package amf.apicontract.internal.spec.async
 
-import amf.apicontract.internal.spec.async.AsyncHeader.{
-  Async20Header,
-  Async21Header,
-  Async22Header,
-  Async23Header,
-  Async24Header,
-  Async25Header,
-  Async26Header
-}
+import amf.apicontract.internal.spec.async.AsyncHeader._
 import amf.apicontract.internal.spec.async.parser.context.{Async2WebApiContext, AsyncWebApiContext}
 import amf.apicontract.internal.spec.async.parser.document
-import amf.apicontract.internal.spec.async.parser.domain.declarations.{
-  Async20DeclarationParser,
-  Async23DeclarationParser,
-  Async24DeclarationParser
-}
 import amf.apicontract.internal.spec.common.AsyncWebApiDeclarations
 import amf.apicontract.internal.spec.oas.OasLikeParsePlugin
 import amf.apicontract.internal.spec.raml.Raml10ParsePlugin
@@ -52,6 +39,12 @@ object Async20ParsePlugin extends OasLikeParsePlugin {
   private def parseAsyncUnit(header: AsyncHeader, root: Root)(implicit ctx: AsyncWebApiContext): BaseUnit = {
     header match {
       case Async20Header => document.AsyncApi20DocumentParser(root).parseDocument()
+      case Async21Header => document.AsyncApi21DocumentParser(root).parseDocument()
+      case Async22Header => document.AsyncApi22DocumentParser(root).parseDocument()
+      case Async23Header => document.AsyncApi23DocumentParser(root).parseDocument()
+      case Async24Header => document.AsyncApi24DocumentParser(root).parseDocument()
+      case Async25Header => document.AsyncApi25DocumentParser(root).parseDocument()
+      case Async26Header => document.AsyncApi26DocumentParser(root).parseDocument()
       case _ =>
         throw new InvalidDocumentHeaderException(spec.id)
     }

amf-cli/shared/src/test/scala/amf/io/BuildCycleTests.scala

@@ -1,7 +1,6 @@
 package amf.io
 
 import amf.apicontract.client.scala.{AMFConfiguration, APIConfiguration}
-import amf.apicontract.internal.spec.async.NotFinishedAsync20ParsePlugin
 import amf.core.client.scala.AMFGraphConfiguration
 import amf.core.client.scala.config.RenderOptions
 import amf.core.client.scala.errorhandling.{AMFErrorHandler, IgnoringErrorHandler}
@@ -148,7 +147,7 @@ trait BuildCycleTestCommon extends FileAssertionTest {
   def renderOptions(): RenderOptions = RenderOptions().withoutFlattenedJsonLd
 
   protected def buildConfig(options: Option[RenderOptions], eh: Option[AMFErrorHandler]): AMFConfiguration = {
-    val amfConfig: AMFConfiguration = APIConfiguration.API().withPlugin(NotFinishedAsync20ParsePlugin)
+    val amfConfig: AMFConfiguration = APIConfiguration.API()
     val renderedConfig: AMFConfiguration = options.fold(amfConfig.withRenderOptions(renderOptions()))(r => {
       amfConfig.withRenderOptions(r)
     })

amf-cli/shared/src/test/scala/amf/testing/ConfigProvider.scala

@@ -1,7 +1,6 @@
 package amf.testing
 
 import amf.apicontract.client.scala._
-import amf.apicontract.internal.spec.async.NotFinishedAsync20ParsePlugin
 import amf.core.internal.remote._
 import amf.graphql.client.scala.GraphQLConfiguration
 import amf.graphqlfederation.client.scala.GraphQLFederationConfiguration
@@ -14,13 +13,13 @@ object ConfigProvider {
     case Raml10            => RAMLConfiguration.RAML10()
     case Oas20             => OASConfiguration.OAS20()
     case Oas30             => OASConfiguration.OAS30()
-    case AsyncApi20        => AsyncAPIConfiguration.Async20().withPlugin(NotFinishedAsync20ParsePlugin)
-    case AsyncApi21        => AsyncAPIConfiguration.Async20().withPlugin(NotFinishedAsync20ParsePlugin)
-    case AsyncApi22        => AsyncAPIConfiguration.Async20().withPlugin(NotFinishedAsync20ParsePlugin)
-    case AsyncApi23        => AsyncAPIConfiguration.Async20().withPlugin(NotFinishedAsync20ParsePlugin)
-    case AsyncApi24        => AsyncAPIConfiguration.Async20().withPlugin(NotFinishedAsync20ParsePlugin)
-    case AsyncApi25        => AsyncAPIConfiguration.Async20().withPlugin(NotFinishedAsync20ParsePlugin)
-    case AsyncApi26        => AsyncAPIConfiguration.Async20().withPlugin(NotFinishedAsync20ParsePlugin)
+    case AsyncApi20        => AsyncAPIConfiguration.Async20()
+    case AsyncApi21        => AsyncAPIConfiguration.Async20()
+    case AsyncApi22        => AsyncAPIConfiguration.Async20()
+    case AsyncApi23        => AsyncAPIConfiguration.Async20()
+    case AsyncApi24        => AsyncAPIConfiguration.Async20()
+    case AsyncApi25        => AsyncAPIConfiguration.Async20()
+    case AsyncApi26        => AsyncAPIConfiguration.Async20()
     case Grpc              => GRPCConfiguration.GRPC()
     case GraphQL           => GraphQLConfiguration.GraphQL()
     case GraphQLFederation => GraphQLFederationConfiguration.GraphQLFederation()

amf-cli/shared/src/test/scala/amf/validation/AMFModelAssertionTest.scala

@@ -4,7 +4,6 @@ import amf.apicontract.client.scala._
 import amf.apicontract.client.scala.model.domain.api.WebApi
 import amf.apicontract.client.scala.model.domain.security.OAuth2Settings
 import amf.apicontract.internal.metamodel.domain.{EndPointModel, OperationModel}
-import amf.apicontract.internal.spec.async.NotFinishedAsync20ParsePlugin
 import amf.core.client.common.transform.PipelineId
 import amf.core.client.scala.config.RenderOptions
 import amf.core.client.scala.model.document.{BaseUnit, Document}
@@ -41,9 +40,8 @@ class AMFModelAssertionTest extends AsyncFunSuite with Matchers {
   val raml08Client: AMFBaseUnitClient = raml08Config.baseUnitClient()
   val oasConfig: AMFConfiguration     = OASConfiguration.OAS30().withRenderOptions(ro)
   val oasClient: AMFBaseUnitClient    = oasConfig.baseUnitClient()
-  val asyncConfig: AMFConfiguration =
-    AsyncAPIConfiguration.Async20().withPlugin(NotFinishedAsync20ParsePlugin).withRenderOptions(ro)
-  val asyncClient: AMFBaseUnitClient = asyncConfig.baseUnitClient()
+  val asyncConfig: AMFConfiguration   = AsyncAPIConfiguration.Async20().withRenderOptions(ro)
+  val asyncClient: AMFBaseUnitClient  = asyncConfig.baseUnitClient()
 
   def modelAssertion(
       path: String,

amf-cli/shared/src/test/scala/amf/validation/UniquePlatformReportGenTest.scala

@@ -1,7 +1,6 @@
 package amf.validation
 
-import amf.apicontract.client.scala.{AMFConfiguration, APIConfiguration, WebAPIConfiguration}
-import amf.apicontract.internal.spec.async.NotFinishedAsync20ParsePlugin
+import amf.apicontract.client.scala.{AMFConfiguration, APIConfiguration}
 import amf.apicontract.internal.transformation.ValidationTransformationPipeline
 import amf.core.client.common.validation._
 import amf.core.client.scala.errorhandling.DefaultErrorHandler
@@ -46,7 +45,7 @@ sealed trait AMFValidationReportGenTest extends AsyncFunSuite with FileAssertion
       configOverride: Option[AMFConfiguration] = None,
       hideValidationResultsIfParseNotConforms: Boolean = true
   ): Future[Assertion] = {
-    val initialConfig = configOverride.getOrElse(APIConfiguration.API().withPlugin(NotFinishedAsync20ParsePlugin))
+    val initialConfig = configOverride.getOrElse(APIConfiguration.API())
     for {
       parseResult <- parse(directory + api, initialConfig)
       report <- configOverride
@@ -93,7 +92,6 @@ trait ResolutionForUniquePlatformReportTest extends UniquePlatformReportGenTest
     val errorHandler = DefaultErrorHandler()
     val config = APIConfiguration
       .API()
-      .withPlugin(NotFinishedAsync20ParsePlugin)
       .withErrorHandlerProvider(() => errorHandler)
     for {
       model <- config.baseUnitClient().parse(basePath + api).map(_.baseUnit)