Skip to content

Commit 1bdee8b

Browse files
bkoelmanbkoelman
authored
Merge pull request #1518 from json-api-dotnet/openapi-links
OpenAPI: Hide inaccessible links
2 parents 66be210 + 7722b87 commit 1bdee8b

File tree

312 files changed

+18796
-3016
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

312 files changed

+18796
-3016
lines changed

Diff for: ‎src/Examples/JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json

+120-166
Large diffs are not rendered by default.

Diff for: ‎src/Examples/OpenApiKiotaClientExample/GeneratedCode/Models/Assignee.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ public PersonAttributesInResponse Attributes {
2323
/// <summary>The links property</summary>
2424
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
2525
#nullable enable
26-
public LinksInResourceData? Links {
27-
get { return BackingStore?.Get<LinksInResourceData?>("links"); }
26+
public ResourceLinks? Links {
27+
get { return BackingStore?.Get<ResourceLinks?>("links"); }
2828
set { BackingStore?.Set("links", value); }
2929
}
3030
#nullable restore
3131
#else
32-
public LinksInResourceData Links {
33-
get { return BackingStore?.Get<LinksInResourceData>("links"); }
32+
public ResourceLinks Links {
33+
get { return BackingStore?.Get<ResourceLinks>("links"); }
3434
set { BackingStore?.Set("links", value); }
3535
}
3636
#endif
@@ -76,7 +76,7 @@ public PersonRelationshipsInResponse Relationships {
7676
public override IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
7777
return new Dictionary<string, Action<IParseNode>>(base.GetFieldDeserializers()) {
7878
{"attributes", n => { Attributes = n.GetObjectValue<PersonAttributesInResponse>(PersonAttributesInResponse.CreateFromDiscriminatorValue); } },
79-
{"links", n => { Links = n.GetObjectValue<LinksInResourceData>(LinksInResourceData.CreateFromDiscriminatorValue); } },
79+
{"links", n => { Links = n.GetObjectValue<ResourceLinks>(ResourceLinks.CreateFromDiscriminatorValue); } },
8080
{"meta", n => { Meta = n.GetObjectValue<Assignee_meta>(Assignee_meta.CreateFromDiscriminatorValue); } },
8181
{"relationships", n => { Relationships = n.GetObjectValue<PersonRelationshipsInResponse>(PersonRelationshipsInResponse.CreateFromDiscriminatorValue); } },
8282
};
@@ -89,7 +89,7 @@ public override void Serialize(ISerializationWriter writer) {
8989
_ = writer ?? throw new ArgumentNullException(nameof(writer));
9090
base.Serialize(writer);
9191
writer.WriteObjectValue<PersonAttributesInResponse>("attributes", Attributes);
92-
writer.WriteObjectValue<LinksInResourceData>("links", Links);
92+
writer.WriteObjectValue<ResourceLinks>("links", Links);
9393
writer.WriteObjectValue<Assignee_meta>("meta", Meta);
9494
writer.WriteObjectValue<PersonRelationshipsInResponse>("relationships", Relationships);
9595
}

Diff for: ‎src/Examples/OpenApiKiotaClientExample/GeneratedCode/Models/ErrorResponseDocument.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ public List<ErrorObject> Errors {
2727
/// <summary>The links property</summary>
2828
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
2929
#nullable enable
30-
public LinksInErrorDocument? Links {
31-
get { return BackingStore?.Get<LinksInErrorDocument?>("links"); }
30+
public ErrorTopLevelLinks? Links {
31+
get { return BackingStore?.Get<ErrorTopLevelLinks?>("links"); }
3232
set { BackingStore?.Set("links", value); }
3333
}
3434
#nullable restore
3535
#else
36-
public LinksInErrorDocument Links {
37-
get { return BackingStore?.Get<LinksInErrorDocument>("links"); }
36+
public ErrorTopLevelLinks Links {
37+
get { return BackingStore?.Get<ErrorTopLevelLinks>("links"); }
3838
set { BackingStore?.Set("links", value); }
3939
}
4040
#endif
@@ -74,7 +74,7 @@ public static ErrorResponseDocument CreateFromDiscriminatorValue(IParseNode pars
7474
public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
7575
return new Dictionary<string, Action<IParseNode>> {
7676
{"errors", n => { Errors = n.GetCollectionOfObjectValues<ErrorObject>(ErrorObject.CreateFromDiscriminatorValue)?.ToList(); } },
77-
{"links", n => { Links = n.GetObjectValue<LinksInErrorDocument>(LinksInErrorDocument.CreateFromDiscriminatorValue); } },
77+
{"links", n => { Links = n.GetObjectValue<ErrorTopLevelLinks>(ErrorTopLevelLinks.CreateFromDiscriminatorValue); } },
7878
{"meta", n => { Meta = n.GetObjectValue<ErrorResponseDocument_meta>(ErrorResponseDocument_meta.CreateFromDiscriminatorValue); } },
7979
};
8080
}
@@ -85,7 +85,7 @@ public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
8585
public virtual void Serialize(ISerializationWriter writer) {
8686
_ = writer ?? throw new ArgumentNullException(nameof(writer));
8787
writer.WriteCollectionOfObjectValues<ErrorObject>("errors", Errors);
88-
writer.WriteObjectValue<LinksInErrorDocument>("links", Links);
88+
writer.WriteObjectValue<ErrorTopLevelLinks>("links", Links);
8989
writer.WriteObjectValue<ErrorResponseDocument_meta>("meta", Meta);
9090
}
9191
}

Diff for: ‎src/Examples/OpenApiKiotaClientExample/GeneratedCode/Models/LinksInErrorDocument.cs renamed to ‎src/Examples/OpenApiKiotaClientExample/GeneratedCode/Models/ErrorTopLevelLinks.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Linq;
77
using System;
88
namespace OpenApiKiotaClientExample.GeneratedCode.Models {
9-
public class LinksInErrorDocument : IBackedModel, IParsable {
9+
public class ErrorTopLevelLinks : IBackedModel, IParsable {
1010
/// <summary>Stores model information.</summary>
1111
public IBackingStore BackingStore { get; private set; }
1212
/// <summary>The describedby property</summary>
@@ -38,18 +38,18 @@ public string Self {
3838
}
3939
#endif
4040
/// <summary>
41-
/// Instantiates a new linksInErrorDocument and sets the default values.
41+
/// Instantiates a new errorTopLevelLinks and sets the default values.
4242
/// </summary>
43-
public LinksInErrorDocument() {
43+
public ErrorTopLevelLinks() {
4444
BackingStore = BackingStoreFactorySingleton.Instance.CreateBackingStore();
4545
}
4646
/// <summary>
4747
/// Creates a new instance of the appropriate class based on discriminator value
4848
/// </summary>
4949
/// <param name="parseNode">The parse node to use to read the discriminator value and create the object</param>
50-
public static LinksInErrorDocument CreateFromDiscriminatorValue(IParseNode parseNode) {
50+
public static ErrorTopLevelLinks CreateFromDiscriminatorValue(IParseNode parseNode) {
5151
_ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
52-
return new LinksInErrorDocument();
52+
return new ErrorTopLevelLinks();
5353
}
5454
/// <summary>
5555
/// The deserialization information for the current model

Diff for: ‎src/Examples/OpenApiKiotaClientExample/GeneratedCode/Models/NullablePersonIdentifierResponseDocument.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ public PersonIdentifier Data {
2626
/// <summary>The links property</summary>
2727
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
2828
#nullable enable
29-
public LinksInResourceIdentifierDocument? Links {
30-
get { return BackingStore?.Get<LinksInResourceIdentifierDocument?>("links"); }
29+
public ResourceIdentifierTopLevelLinks? Links {
30+
get { return BackingStore?.Get<ResourceIdentifierTopLevelLinks?>("links"); }
3131
set { BackingStore?.Set("links", value); }
3232
}
3333
#nullable restore
3434
#else
35-
public LinksInResourceIdentifierDocument Links {
36-
get { return BackingStore?.Get<LinksInResourceIdentifierDocument>("links"); }
35+
public ResourceIdentifierTopLevelLinks Links {
36+
get { return BackingStore?.Get<ResourceIdentifierTopLevelLinks>("links"); }
3737
set { BackingStore?.Set("links", value); }
3838
}
3939
#endif
@@ -71,7 +71,7 @@ public static NullablePersonIdentifierResponseDocument CreateFromDiscriminatorVa
7171
public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
7272
return new Dictionary<string, Action<IParseNode>> {
7373
{"data", n => { Data = n.GetObjectValue<PersonIdentifier>(PersonIdentifier.CreateFromDiscriminatorValue); } },
74-
{"links", n => { Links = n.GetObjectValue<LinksInResourceIdentifierDocument>(LinksInResourceIdentifierDocument.CreateFromDiscriminatorValue); } },
74+
{"links", n => { Links = n.GetObjectValue<ResourceIdentifierTopLevelLinks>(ResourceIdentifierTopLevelLinks.CreateFromDiscriminatorValue); } },
7575
{"meta", n => { Meta = n.GetObjectValue<NullablePersonIdentifierResponseDocument_meta>(NullablePersonIdentifierResponseDocument_meta.CreateFromDiscriminatorValue); } },
7676
};
7777
}
@@ -82,7 +82,7 @@ public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
8282
public virtual void Serialize(ISerializationWriter writer) {
8383
_ = writer ?? throw new ArgumentNullException(nameof(writer));
8484
writer.WriteObjectValue<PersonIdentifier>("data", Data);
85-
writer.WriteObjectValue<LinksInResourceIdentifierDocument>("links", Links);
85+
writer.WriteObjectValue<ResourceIdentifierTopLevelLinks>("links", Links);
8686
writer.WriteObjectValue<NullablePersonIdentifierResponseDocument_meta>("meta", Meta);
8787
}
8888
}

Diff for: ‎src/Examples/OpenApiKiotaClientExample/GeneratedCode/Models/NullablePersonSecondaryResponseDocument.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ public List<DataInResponse> Included {
4040
/// <summary>The links property</summary>
4141
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
4242
#nullable enable
43-
public LinksInResourceDocument? Links {
44-
get { return BackingStore?.Get<LinksInResourceDocument?>("links"); }
43+
public ResourceTopLevelLinks? Links {
44+
get { return BackingStore?.Get<ResourceTopLevelLinks?>("links"); }
4545
set { BackingStore?.Set("links", value); }
4646
}
4747
#nullable restore
4848
#else
49-
public LinksInResourceDocument Links {
50-
get { return BackingStore?.Get<LinksInResourceDocument>("links"); }
49+
public ResourceTopLevelLinks Links {
50+
get { return BackingStore?.Get<ResourceTopLevelLinks>("links"); }
5151
set { BackingStore?.Set("links", value); }
5252
}
5353
#endif
@@ -86,7 +86,7 @@ public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
8686
return new Dictionary<string, Action<IParseNode>> {
8787
{"data", n => { Data = n.GetObjectValue<Assignee>(Assignee.CreateFromDiscriminatorValue); } },
8888
{"included", n => { Included = n.GetCollectionOfObjectValues<DataInResponse>(DataInResponse.CreateFromDiscriminatorValue)?.ToList(); } },
89-
{"links", n => { Links = n.GetObjectValue<LinksInResourceDocument>(LinksInResourceDocument.CreateFromDiscriminatorValue); } },
89+
{"links", n => { Links = n.GetObjectValue<ResourceTopLevelLinks>(ResourceTopLevelLinks.CreateFromDiscriminatorValue); } },
9090
{"meta", n => { Meta = n.GetObjectValue<NullablePersonSecondaryResponseDocument_meta>(NullablePersonSecondaryResponseDocument_meta.CreateFromDiscriminatorValue); } },
9191
};
9292
}
@@ -98,7 +98,7 @@ public virtual void Serialize(ISerializationWriter writer) {
9898
_ = writer ?? throw new ArgumentNullException(nameof(writer));
9999
writer.WriteObjectValue<Assignee>("data", Data);
100100
writer.WriteCollectionOfObjectValues<DataInResponse>("included", Included);
101-
writer.WriteObjectValue<LinksInResourceDocument>("links", Links);
101+
writer.WriteObjectValue<ResourceTopLevelLinks>("links", Links);
102102
writer.WriteObjectValue<NullablePersonSecondaryResponseDocument_meta>("meta", Meta);
103103
}
104104
}

Diff for: ‎src/Examples/OpenApiKiotaClientExample/GeneratedCode/Models/NullableToOnePersonInResponse.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ public PersonIdentifier Data {
2626
/// <summary>The links property</summary>
2727
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
2828
#nullable enable
29-
public LinksInRelationship? Links {
30-
get { return BackingStore?.Get<LinksInRelationship?>("links"); }
29+
public RelationshipLinks? Links {
30+
get { return BackingStore?.Get<RelationshipLinks?>("links"); }
3131
set { BackingStore?.Set("links", value); }
3232
}
3333
#nullable restore
3434
#else
35-
public LinksInRelationship Links {
36-
get { return BackingStore?.Get<LinksInRelationship>("links"); }
35+
public RelationshipLinks Links {
36+
get { return BackingStore?.Get<RelationshipLinks>("links"); }
3737
set { BackingStore?.Set("links", value); }
3838
}
3939
#endif
@@ -71,7 +71,7 @@ public static NullableToOnePersonInResponse CreateFromDiscriminatorValue(IParseN
7171
public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
7272
return new Dictionary<string, Action<IParseNode>> {
7373
{"data", n => { Data = n.GetObjectValue<PersonIdentifier>(PersonIdentifier.CreateFromDiscriminatorValue); } },
74-
{"links", n => { Links = n.GetObjectValue<LinksInRelationship>(LinksInRelationship.CreateFromDiscriminatorValue); } },
74+
{"links", n => { Links = n.GetObjectValue<RelationshipLinks>(RelationshipLinks.CreateFromDiscriminatorValue); } },
7575
{"meta", n => { Meta = n.GetObjectValue<NullableToOnePersonInResponse_meta>(NullableToOnePersonInResponse_meta.CreateFromDiscriminatorValue); } },
7676
};
7777
}
@@ -82,7 +82,7 @@ public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
8282
public virtual void Serialize(ISerializationWriter writer) {
8383
_ = writer ?? throw new ArgumentNullException(nameof(writer));
8484
writer.WriteObjectValue<PersonIdentifier>("data", Data);
85-
writer.WriteObjectValue<LinksInRelationship>("links", Links);
85+
writer.WriteObjectValue<RelationshipLinks>("links", Links);
8686
writer.WriteObjectValue<NullableToOnePersonInResponse_meta>("meta", Meta);
8787
}
8888
}

Diff for: ‎src/Examples/OpenApiKiotaClientExample/GeneratedCode/Models/Owner.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ public PersonAttributesInResponse Attributes {
2323
/// <summary>The links property</summary>
2424
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
2525
#nullable enable
26-
public LinksInResourceData? Links {
27-
get { return BackingStore?.Get<LinksInResourceData?>("links"); }
26+
public ResourceLinks? Links {
27+
get { return BackingStore?.Get<ResourceLinks?>("links"); }
2828
set { BackingStore?.Set("links", value); }
2929
}
3030
#nullable restore
3131
#else
32-
public LinksInResourceData Links {
33-
get { return BackingStore?.Get<LinksInResourceData>("links"); }
32+
public ResourceLinks Links {
33+
get { return BackingStore?.Get<ResourceLinks>("links"); }
3434
set { BackingStore?.Set("links", value); }
3535
}
3636
#endif
@@ -76,7 +76,7 @@ public PersonRelationshipsInResponse Relationships {
7676
public override IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
7777
return new Dictionary<string, Action<IParseNode>>(base.GetFieldDeserializers()) {
7878
{"attributes", n => { Attributes = n.GetObjectValue<PersonAttributesInResponse>(PersonAttributesInResponse.CreateFromDiscriminatorValue); } },
79-
{"links", n => { Links = n.GetObjectValue<LinksInResourceData>(LinksInResourceData.CreateFromDiscriminatorValue); } },
79+
{"links", n => { Links = n.GetObjectValue<ResourceLinks>(ResourceLinks.CreateFromDiscriminatorValue); } },
8080
{"meta", n => { Meta = n.GetObjectValue<Owner_meta>(Owner_meta.CreateFromDiscriminatorValue); } },
8181
{"relationships", n => { Relationships = n.GetObjectValue<PersonRelationshipsInResponse>(PersonRelationshipsInResponse.CreateFromDiscriminatorValue); } },
8282
};
@@ -89,7 +89,7 @@ public override void Serialize(ISerializationWriter writer) {
8989
_ = writer ?? throw new ArgumentNullException(nameof(writer));
9090
base.Serialize(writer);
9191
writer.WriteObjectValue<PersonAttributesInResponse>("attributes", Attributes);
92-
writer.WriteObjectValue<LinksInResourceData>("links", Links);
92+
writer.WriteObjectValue<ResourceLinks>("links", Links);
9393
writer.WriteObjectValue<Owner_meta>("meta", Meta);
9494
writer.WriteObjectValue<PersonRelationshipsInResponse>("relationships", Relationships);
9595
}

Diff for: ‎src/Examples/OpenApiKiotaClientExample/GeneratedCode/Models/People.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ public PersonAttributesInResponse Attributes {
2323
/// <summary>The links property</summary>
2424
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
2525
#nullable enable
26-
public LinksInResourceData? Links {
27-
get { return BackingStore?.Get<LinksInResourceData?>("links"); }
26+
public ResourceLinks? Links {
27+
get { return BackingStore?.Get<ResourceLinks?>("links"); }
2828
set { BackingStore?.Set("links", value); }
2929
}
3030
#nullable restore
3131
#else
32-
public LinksInResourceData Links {
33-
get { return BackingStore?.Get<LinksInResourceData>("links"); }
32+
public ResourceLinks Links {
33+
get { return BackingStore?.Get<ResourceLinks>("links"); }
3434
set { BackingStore?.Set("links", value); }
3535
}
3636
#endif
@@ -76,7 +76,7 @@ public PersonRelationshipsInResponse Relationships {
7676
public override IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
7777
return new Dictionary<string, Action<IParseNode>>(base.GetFieldDeserializers()) {
7878
{"attributes", n => { Attributes = n.GetObjectValue<PersonAttributesInResponse>(PersonAttributesInResponse.CreateFromDiscriminatorValue); } },
79-
{"links", n => { Links = n.GetObjectValue<LinksInResourceData>(LinksInResourceData.CreateFromDiscriminatorValue); } },
79+
{"links", n => { Links = n.GetObjectValue<ResourceLinks>(ResourceLinks.CreateFromDiscriminatorValue); } },
8080
{"meta", n => { Meta = n.GetObjectValue<People_meta>(People_meta.CreateFromDiscriminatorValue); } },
8181
{"relationships", n => { Relationships = n.GetObjectValue<PersonRelationshipsInResponse>(PersonRelationshipsInResponse.CreateFromDiscriminatorValue); } },
8282
};
@@ -89,7 +89,7 @@ public override void Serialize(ISerializationWriter writer) {
8989
_ = writer ?? throw new ArgumentNullException(nameof(writer));
9090
base.Serialize(writer);
9191
writer.WriteObjectValue<PersonAttributesInResponse>("attributes", Attributes);
92-
writer.WriteObjectValue<LinksInResourceData>("links", Links);
92+
writer.WriteObjectValue<ResourceLinks>("links", Links);
9393
writer.WriteObjectValue<People_meta>("meta", Meta);
9494
writer.WriteObjectValue<PersonRelationshipsInResponse>("relationships", Relationships);
9595
}

0 commit comments

Comments
 (0)