Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions samples/StreetLightsApi/Program.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright � 2021-Present Neuroglia SRL. All rights reserved.
// Copyright � 2021-Present Neuroglia SRL. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License"),
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -260,7 +260,7 @@
.WithTrait(trait => trait
.Use("#/components/messageTraits/cloud-event"))
.WithPayloadSchema(schema => schema
.WithFormat("application/schema+json")
.WithFormat("application/vnd.aai.asyncapi+json;version=3.0.0")
.WithSchema(lightMeasuredEventSchema))
.WithCorrelationId(setup => setup
.WithLocation("$message.payload#/subject"))
Expand All @@ -273,7 +273,7 @@
.WithTrait(trait => trait
.Use("#/components/messageTraits/cloud-event"))
.WithPayloadSchema(schema => schema
.WithFormat("application/schema+json")
.WithFormat("application/vnd.aai.asyncapi+json;version=3.0.0")
.WithSchema(movementDetectedEventSchema))
.WithCorrelationId(setup => setup
.WithLocation("$message.payload#/subject"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
@inject Neuroglia.AsyncApi.Generation.IJsonSchemaExampleGenerator ExampleGenerator
@{
var schemaContext = Model.Context == SchemaContext.Unknown ? string.Empty : EnumHelper.Stringify(Model.Context);
var schemaFormat = Model.Definition.SchemaFormat?.Split(';', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)[0] ?? "application/schema+json";
var schemaFormat = Model.Definition.SchemaFormat?.Split(';', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)[0] ?? "application/vnd.aai.asyncapi+json;version=3.0.0";
switch (schemaFormat)
{
case "application/schema+json":
case "application/vnd.aai.asyncapi+json;version=3.0.0":
var schema = Model.Definition.Schema is JsonSchema jsonSchema ? jsonSchema : JsonSerializer.Deserialize<JsonSchema>(JsonSerializer.SerializeToText(Model.Definition))!;
var type = schema.GetJsonType()!;
var properties = schema.GetProperties();
Expand Down
2 changes: 1 addition & 1 deletion src/Neuroglia.AsyncApi.Client/SchemaFormat.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public static class SchemaFormat
/// <summary>
/// Gets the format for JSON Schemas
/// </summary>
public const string Json = "application/schema+json";
public const string Json = "application/vnd.aai.asyncapi+json;version=3.0.0";
/// <summary>
/// Gets the format for XML Schemas
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public virtual void WithJsonSchema(Action<JsonSchemaBuilder> setup)
ArgumentNullException.ThrowIfNull(setup);
var builder = new JsonSchemaBuilder();
setup(builder);
Schema.SchemaFormat = "application/schema+json";
Schema.SchemaFormat = "application/vnd.aai.asyncapi+json;version=3.0.0";
Schema.Schema = builder.Build();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ protected virtual Task GenerateV3OperationForAsync(IV3AsyncApiDocumentBuilder do
{
message
.WithPayloadSchema(schema => schema
.WithFormat("application/schema+json")
.WithFormat("application/vnd.aai.asyncapi+json;version=3.0.0")
.WithSchema(requestMessagePayloadSchema));
}
if (!string.IsNullOrWhiteSpace(requestMessageAttribute?.HeadersSchema))
Expand All @@ -321,7 +321,7 @@ protected virtual Task GenerateV3OperationForAsync(IV3AsyncApiDocumentBuilder do
{
message
.WithHeadersSchema(schema => schema
.WithFormat("application/schema+json")
.WithFormat("application/vnd.aai.asyncapi+json;version=3.0.0")
.WithSchema(requestMessageHeadersSchema));
}
if (requestMessageAttribute?.ExternalDocumentationUrl != null)
Expand Down