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
4 changes: 2 additions & 2 deletions src/LEGO.AsyncAPI.Readers/AsyncApiTextReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ namespace LEGO.AsyncAPI.Readers
using LEGO.AsyncAPI.Models;
using LEGO.AsyncAPI.Models.Interfaces;
using LEGO.AsyncAPI.Readers.Interface;
using SharpYaml;
using SharpYaml.Serialization;
using YamlDotNet.Core;
using YamlDotNet.RepresentationModel;

/// <summary>
/// Service class for converting contents of TextReader into AsyncApiDocument instances
Expand Down
2 changes: 1 addition & 1 deletion src/LEGO.AsyncAPI.Readers/AsyncApiYamlDocumentReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace LEGO.AsyncAPI.Readers
using LEGO.AsyncAPI.Models.Interfaces;
using LEGO.AsyncAPI.Readers.Interface;
using LEGO.AsyncAPI.Validations;
using SharpYaml.Serialization;
using YamlDotNet.RepresentationModel;

/// <summary>
/// Service class for converting contents of TextReader into AsyncApiDocument instances
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace LEGO.AsyncAPI.Readers
{
using LEGO.AsyncAPI.Models.Bindings.Http;
using LEGO.AsyncAPI.Readers.ParseNodes;
using Models.Bindings.WebSockets;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace LEGO.AsyncAPI.Readers.Exceptions
{
using System;
using LEGO.AsyncAPI.Exceptions;
using SharpYaml.Serialization;
using YamlDotNet.RepresentationModel;

[Serializable]
public class AsyncApiReaderException : AsyncApiException
Expand Down
4 changes: 2 additions & 2 deletions src/LEGO.AsyncAPI.Readers/LEGO.AsyncAPI.Readers.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
Expand All @@ -24,11 +24,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="JsonSchema.Net" Version="2.0.1" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="YamlDotNet" Version="13.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace LEGO.AsyncAPI.Readers.ParseNodes
{
using System;
using SharpYaml.Serialization;
using YamlDotNet.RepresentationModel;

public static class JsonPointerExtensions
{
Expand Down
2 changes: 1 addition & 1 deletion src/LEGO.AsyncAPI.Readers/ParseNodes/ListNode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace LEGO.AsyncAPI.Readers.ParseNodes
using LEGO.AsyncAPI.Models.Any;
using LEGO.AsyncAPI.Models.Interfaces;
using LEGO.AsyncAPI.Readers.Exceptions;
using SharpYaml.Serialization;
using YamlDotNet.RepresentationModel;

internal class ListNode : ParseNode, IEnumerable<ParseNode>
{
Expand Down
7 changes: 3 additions & 4 deletions src/LEGO.AsyncAPI.Readers/ParseNodes/MapNode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ namespace LEGO.AsyncAPI.Readers.ParseNodes
using System.Linq;
using LEGO.AsyncAPI.Models;
using LEGO.AsyncAPI.Models.Any;
using LEGO.AsyncAPI.Models.Bindings;
using LEGO.AsyncAPI.Models.Interfaces;
using LEGO.AsyncAPI.Readers.Exceptions;
using SharpYaml.Schemas;
using SharpYaml.Serialization;
using YamlDotNet.RepresentationModel;
using YamlDotNet.Serialization;

internal class MapNode : ParseNode, IEnumerable<PropertyNode>
{
Expand Down Expand Up @@ -228,7 +227,7 @@ IEnumerator IEnumerable.GetEnumerator()

public override string GetRaw()
{
var x = new Serializer(new SerializerSettings(new JsonSchema()) { EmitJsonComptible = true });
var x = new SerializerBuilder().JsonCompatible().Build();
return x.Serialize(this.node);
}

Expand Down
4 changes: 1 addition & 3 deletions src/LEGO.AsyncAPI.Readers/ParseNodes/ParseNode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ namespace LEGO.AsyncAPI.Readers.ParseNodes
{
using System;
using System.Collections.Generic;
using System.Threading;
using LEGO.AsyncAPI.Models;
using LEGO.AsyncAPI.Models.Bindings;
using LEGO.AsyncAPI.Models.Interfaces;
using LEGO.AsyncAPI.Readers.Exceptions;
using SharpYaml.Serialization;
using YamlDotNet.RepresentationModel;

internal abstract class ParseNode
{
Expand Down
2 changes: 1 addition & 1 deletion src/LEGO.AsyncAPI.Readers/ParseNodes/PropertyNode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace LEGO.AsyncAPI.Readers.ParseNodes
using LEGO.AsyncAPI.Models;
using LEGO.AsyncAPI.Models.Interfaces;
using LEGO.AsyncAPI.Readers.Exceptions;
using SharpYaml.Serialization;
using YamlDotNet.RepresentationModel;

internal class PropertyNode : ParseNode
{
Expand Down
2 changes: 1 addition & 1 deletion src/LEGO.AsyncAPI.Readers/ParseNodes/RootNode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace LEGO.AsyncAPI.Readers.ParseNodes
{
using SharpYaml.Serialization;
using YamlDotNet.RepresentationModel;

internal class RootNode : ParseNode
{
Expand Down
4 changes: 2 additions & 2 deletions src/LEGO.AsyncAPI.Readers/ParseNodes/ValueNode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ namespace LEGO.AsyncAPI.Readers.ParseNodes
using LEGO.AsyncAPI.Models.Any;
using LEGO.AsyncAPI.Models.Interfaces;
using LEGO.AsyncAPI.Readers.Exceptions;
using SharpYaml;
using SharpYaml.Serialization;
using YamlDotNet.Core;
using YamlDotNet.RepresentationModel;

internal class ValueNode : ParseNode
{
Expand Down
2 changes: 1 addition & 1 deletion src/LEGO.AsyncAPI.Readers/ParsingContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace LEGO.AsyncAPI.Readers
using LEGO.AsyncAPI.Readers.Interface;
using LEGO.AsyncAPI.Readers.ParseNodes;
using LEGO.AsyncAPI.Readers.V2;
using SharpYaml.Serialization;
using YamlDotNet.RepresentationModel;

public class ParsingContext
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ namespace LEGO.AsyncAPI.Readers
{
using LEGO.AsyncAPI.Extensions;
using LEGO.AsyncAPI.Models;
using LEGO.AsyncAPI.Models.Interfaces;
using LEGO.AsyncAPI.Readers.ParseNodes;
using System.Linq;

internal static partial class AsyncApiV2Deserializer
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace LEGO.AsyncAPI.Readers
{
using LEGO.AsyncAPI.Exceptions;
using LEGO.AsyncAPI.Extensions;
using LEGO.AsyncAPI.Models;
using LEGO.AsyncAPI.Models.Bindings;
using LEGO.AsyncAPI.Models.Bindings.Http;
Expand Down
2 changes: 0 additions & 2 deletions src/LEGO.AsyncAPI.Readers/V2/AsyncApiMessageDeserializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ namespace LEGO.AsyncAPI.Readers
using LEGO.AsyncAPI.Extensions;
using LEGO.AsyncAPI.Models;
using LEGO.AsyncAPI.Readers.ParseNodes;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;

Expand Down
39 changes: 0 additions & 39 deletions src/LEGO.AsyncAPI.Readers/V2/AsyncApiSchemaValidator.cs

This file was deleted.

1 change: 0 additions & 1 deletion src/LEGO.AsyncAPI.Readers/V2/AsyncApiV2VersionService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ namespace LEGO.AsyncAPI.Readers.V2
using System.Collections.Generic;
using LEGO.AsyncAPI.Exceptions;
using LEGO.AsyncAPI.Models;
using LEGO.AsyncAPI.Models.Bindings.Http;
using LEGO.AsyncAPI.Models.Interfaces;
using LEGO.AsyncAPI.Readers.Interface;
using LEGO.AsyncAPI.Readers.ParseNodes;
Expand Down
2 changes: 1 addition & 1 deletion src/LEGO.AsyncAPI.Readers/YamlHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace LEGO.AsyncAPI.Readers
using System.IO;
using System.Linq;
using LEGO.AsyncAPI.Exceptions;
using SharpYaml.Serialization;
using YamlDotNet.RepresentationModel;

internal static class YamlHelper
{
Expand Down
7 changes: 1 addition & 6 deletions src/LEGO.AsyncAPI/LEGO.AsyncAPI.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
Expand All @@ -23,7 +23,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="SharpYaml" Version="1.9.2" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -33,10 +32,6 @@
<_Parameter1>$(MSBuildProjectName).Tests</_Parameter1>
</AssemblyAttribute>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="schema-v2.3.0.json" />
</ItemGroup>

<ItemGroup>
<None Include="..\..\readme.md">
Expand Down
2 changes: 0 additions & 2 deletions src/LEGO.AsyncAPI/Models/Interfaces/IMessageBinding.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) The LEGO Group. All rights reserved.
namespace LEGO.AsyncAPI.Models.Interfaces
{
using LEGO.AsyncAPI.Models.Bindings;

/// <summary>
/// Describes a message-specific binding.
/// </summary>
Expand Down
2 changes: 0 additions & 2 deletions src/LEGO.AsyncAPI/Models/Interfaces/IOperationBinding.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) The LEGO Group. All rights reserved.
namespace LEGO.AsyncAPI.Models.Interfaces
{
using LEGO.AsyncAPI.Models.Bindings;

/// <summary>
/// Describes an operation-specific binding.
/// </summary>
Expand Down
2 changes: 0 additions & 2 deletions src/LEGO.AsyncAPI/Models/Interfaces/IServerBinding.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) The LEGO Group. All rights reserved.
namespace LEGO.AsyncAPI.Models.Interfaces
{
using LEGO.AsyncAPI.Models.Bindings;

/// <summary>
/// Describes a server-specific binding.
/// </summary>
Expand Down
1 change: 0 additions & 1 deletion src/LEGO.AsyncAPI/Writers/AsyncApiWriterAnyExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ namespace LEGO.AsyncAPI.Writers
{
using System;
using System.Collections.Generic;
using LEGO.AsyncAPI.Models;
using LEGO.AsyncAPI.Models.Any;
using LEGO.AsyncAPI.Models.Interfaces;

Expand Down
1 change: 0 additions & 1 deletion src/LEGO.AsyncAPI/Writers/AsyncApiWriterSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace LEGO.AsyncAPI.Writers
{
using LEGO.AsyncAPI.Models;
using System;

public class AsyncApiWriterSettings
{
Expand Down
Loading