Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fixed GRAPHQL_FEDERATION field value #503

Merged
merged 2 commits into from
Jul 29, 2022
Merged

fix: fixed GRAPHQL_FEDERATION field value #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ea1df2
fix: fixed GRAPHQL_FEDERATION field value
tomsfernandez Jul 28, 2022
cb7fbed
feat: added posibility to ignore elements in IdAdopter
tomsfernandez Jul 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions shared/src/main/scala/amf/core/client/common/validation/ProfileNames.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@ object ProfileNames {
val PAYLOAD: ProfileName = PayloadProfile
val GRPC: ProfileName = GrpcProfile
val GRAPHQL: ProfileName = GraphQLProfile
val GRAPHQL_FEDERATION: ProfileName = GraphQLProfile
val GRAPHQL_FEDERATION: ProfileName = GraphQLFederationProfile
val JSONSCHEMA: ProfileName = JsonSchemaProfile

lazy val specProfiles: Seq[ProfileName] =
Seq(
AmfProfile,
Oas20Profile,
Oas30Profile,
Raml08Profile,
Raml10Profile,
AsyncProfile,
Async20Profile,
GraphQLProfile,
GraphQLFederationProfile,
GrpcProfile,
JsonSchemaProfile
AmfProfile,
Oas20Profile,
Oas30Profile,
Raml08Profile,
Raml10Profile,
AsyncProfile,
Async20Profile,
GraphQLProfile,
GraphQLFederationProfile,
GrpcProfile,
JsonSchemaProfile
)
}

Expand Down
8 changes: 5 additions & 3 deletions shared/src/main/scala/amf/core/internal/adoption/IdAdopter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ import org.mulesoft.common.functional.MonadInstances.{Identity, identityMonad}

import scala.collection.mutable

class IdAdopter(initialElem: AmfObject, initialId: String) {

val adopted: mutable.Map[String, AmfObject] = mutable.Map.empty
class IdAdopter(
initialElem: AmfObject,
initialId: String,
private val adopted: mutable.Map[String, AmfObject] = mutable.Map.empty
) {

def adoptFromRoot(): Unit = adopt(isRoot = true)
def adoptFromRelative(): Unit = adopt(isRoot = false)
Expand Down