Skip to content

Fix InvalidOperationException in pagination when services return relative nextLink URIs #56249

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

Merged
JoshLove-msft merged 3 commits into from
Feb 13, 2026
Merged

Fix InvalidOperationException in pagination when services return relative nextLink URIs #56249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6254280
Initial plan
Copilot Feb 13, 2026
6965727
Fix relative URI handling in pagination - use IsAbsoluteUri check
Copilot Feb 13, 2026
7663622
Revert Spector and package-lock.json changes
Copilot Feb 13, 2026
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
7 changes: 6 additions & 1 deletion ...-client-csharp/generator/Azure.Generator/src/Providers/AzureCollectionResultDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,12 @@ private MethodBodyStatement[] BuildAsPagesMethodBody()
Declare("result", ResponseModelType, responseVariable.CastTo(ResponseModelType), out var resultVariable),
};

var nextPageExpression = _paging.NextLink != null ? nextPageVariable.NullConditional().Property("AbsoluteUri") : nextPageVariable;
ValueExpression nextPageExpression = _paging.NextLink != null
? new TernaryConditionalExpression(
nextPageVariable.NullConditional().Property(nameof(Uri.IsAbsoluteUri)).Equal(True),
nextPageVariable.Property(nameof(Uri.AbsoluteUri)),
nextPageVariable.NullConditional().Property(nameof(Uri.OriginalString)))
: nextPageVariable;
if (_isProtocol)
{
// Convert items to BinaryData
Expand Down
2 changes: 1 addition & 1 deletion ...ders/CollectionResultDefinitions/TestData/NextLinkTests/MaxPageSizePassedToNextRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public CatClientGetCatsCollectionResult(global::Samples.CatClient client, int? m
{
items.Add(global::System.ClientModel.Primitives.ModelReaderWriter.Write(item, global::Samples.ModelSerializationExtensions.WireOptions, global::Samples.SamplesContext.Default));
}
yield return global::Azure.Page<global::System.BinaryData>.FromValues(items, nextPage?.AbsoluteUri, response);
yield return global::Azure.Page<global::System.BinaryData>.FromValues(items, (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response);
nextPage = result.NextCat;
if ((nextPage == null))
{
Expand Down
2 changes: 1 addition & 1 deletion ...lectionResultDefinitions/TestData/NextLinkTests/MaxPageSizeRequiredPassedToNextRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public CatClientGetCatsCollectionResult(global::Samples.CatClient client, int ma
{
items.Add(global::System.ClientModel.Primitives.ModelReaderWriter.Write(item, global::Samples.ModelSerializationExtensions.WireOptions, global::Samples.SamplesContext.Default));
}
yield return global::Azure.Page<global::System.BinaryData>.FromValues(items, nextPage?.AbsoluteUri, response);
yield return global::Azure.Page<global::System.BinaryData>.FromValues(items, (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response);
nextPage = result.NextCat;
if ((nextPage == null))
{
Expand Down
2 changes: 1 addition & 1 deletion ...rator/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBody.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public CatClientGetCatsCollectionResult(global::Samples.CatClient client, global
{
items.Add(global::System.ClientModel.Primitives.ModelReaderWriter.Write(item, global::Samples.ModelSerializationExtensions.WireOptions, global::Samples.SamplesContext.Default));
}
yield return global::Azure.Page<global::System.BinaryData>.FromValues(items, nextPage?.AbsoluteUri, response);
yield return global::Azure.Page<global::System.BinaryData>.FromValues(items, (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response);
nextPage = result.NextCat;
if ((nextPage == null))
{
Expand Down
2 changes: 1 addition & 1 deletion .../test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyAsync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public CatClientGetCatsAsyncCollectionResult(global::Samples.CatClient client, g
{
items.Add(global::System.ClientModel.Primitives.ModelReaderWriter.Write(item, global::Samples.ModelSerializationExtensions.WireOptions, global::Samples.SamplesContext.Default));
}
yield return global::Azure.Page<global::System.BinaryData>.FromValues(items, nextPage?.AbsoluteUri, response);
yield return global::Azure.Page<global::System.BinaryData>.FromValues(items, (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response);
nextPage = result.NextCat;
if ((nextPage == null))
{
Expand Down
2 changes: 1 addition & 1 deletion ...or/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfT.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public CatClientGetCatsCollectionResultOfT(global::Samples.CatClient client, glo
yield break;
}
global::Samples.Models.Page result = ((global::Samples.Models.Page)response);
yield return global::Azure.Page<global::Samples.Models.Cat>.FromValues(((global::System.Collections.Generic.IReadOnlyList<global::Samples.Models.Cat>)result.Cats), nextPage?.AbsoluteUri, response);
yield return global::Azure.Page<global::Samples.Models.Cat>.FromValues(((global::System.Collections.Generic.IReadOnlyList<global::Samples.Models.Cat>)result.Cats), (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response);
nextPage = result.NextCat;
if ((nextPage == null))
{
Expand Down
2 changes: 1 addition & 1 deletion ...st/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfTAsync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public CatClientGetCatsAsyncCollectionResultOfT(global::Samples.CatClient client
yield break;
}
global::Samples.Models.Page result = ((global::Samples.Models.Page)response);
yield return global::Azure.Page<global::Samples.Models.Cat>.FromValues(((global::System.Collections.Generic.IReadOnlyList<global::Samples.Models.Cat>)result.Cats), nextPage?.AbsoluteUri, response);
yield return global::Azure.Page<global::Samples.Models.Cat>.FromValues(((global::System.Collections.Generic.IReadOnlyList<global::Samples.Models.Cat>)result.Cats), (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response);
nextPage = result.NextCat;
if ((nextPage == null))
{
Expand Down
4 changes: 2 additions & 2 deletions ...CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyOfTWithStringProperty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ public CatClientGetCatsCollectionResultOfT(global::Samples.CatClient client, glo
yield break;
}
global::Samples.Models.Page result = ((global::Samples.Models.Page)response);
yield return global::Azure.Page<global::Samples.Models.Cat>.FromValues(((global::System.Collections.Generic.IReadOnlyList<global::Samples.Models.Cat>)result.Cats), nextPage?.AbsoluteUri, response);
yield return global::Azure.Page<global::Samples.Models.Cat>.FromValues(((global::System.Collections.Generic.IReadOnlyList<global::Samples.Models.Cat>)result.Cats), (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response);
string nextPageString = result.NextCat;
if (string.IsNullOrEmpty(nextPageString))
{
yield break;
}
nextPage = new global::System.Uri(nextPageString);
nextPage = new global::System.Uri(nextPageString, global::System.UriKind.RelativeOrAbsolute);
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...rs/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInBodyWithStringProperty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ public CatClientGetCatsCollectionResult(global::Samples.CatClient client, global
{
items.Add(global::System.ClientModel.Primitives.ModelReaderWriter.Write(item, global::Samples.ModelSerializationExtensions.WireOptions, global::Samples.SamplesContext.Default));
}
yield return global::Azure.Page<global::System.BinaryData>.FromValues(items, nextPage?.AbsoluteUri, response);
yield return global::Azure.Page<global::System.BinaryData>.FromValues(items, (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response);
string nextPageString = result.NextCat;
if (string.IsNullOrEmpty(nextPageString))
{
yield break;
}
nextPage = new global::System.Uri(nextPageString);
nextPage = new global::System.Uri(nextPageString, global::System.UriKind.RelativeOrAbsolute);
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...tor/test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ public CatClientGetCatsCollectionResult(global::Samples.CatClient client, global
{
items.Add(global::System.ClientModel.Primitives.ModelReaderWriter.Write(item, global::Samples.ModelSerializationExtensions.WireOptions, global::Samples.SamplesContext.Default));
}
yield return global::Azure.Page<global::System.BinaryData>.FromValues(items, nextPage?.AbsoluteUri, response);
yield return global::Azure.Page<global::System.BinaryData>.FromValues(items, (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response);
if ((response.Headers.TryGetValue("nextCat", out string value) && !string.IsNullOrEmpty(value)))
{
nextPage = new global::System.Uri(value);
nextPage = new global::System.Uri(value, global::System.UriKind.RelativeOrAbsolute);
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions ...est/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderAsync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ public CatClientGetCatsAsyncCollectionResult(global::Samples.CatClient client, g
{
items.Add(global::System.ClientModel.Primitives.ModelReaderWriter.Write(item, global::Samples.ModelSerializationExtensions.WireOptions, global::Samples.SamplesContext.Default));
}
yield return global::Azure.Page<global::System.BinaryData>.FromValues(items, nextPage?.AbsoluteUri, response);
yield return global::Azure.Page<global::System.BinaryData>.FromValues(items, (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response);
if ((response.Headers.TryGetValue("nextCat", out string value) && !string.IsNullOrEmpty(value)))
{
nextPage = new global::System.Uri(value);
nextPage = new global::System.Uri(value, global::System.UriKind.RelativeOrAbsolute);
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions .../test/Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderOfT.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ public CatClientGetCatsCollectionResultOfT(global::Samples.CatClient client, glo
yield break;
}
global::Samples.Models.Page result = ((global::Samples.Models.Page)response);
yield return global::Azure.Page<global::Samples.Models.Cat>.FromValues(((global::System.Collections.Generic.IReadOnlyList<global::Samples.Models.Cat>)result.Cats), nextPage?.AbsoluteUri, response);
yield return global::Azure.Page<global::Samples.Models.Cat>.FromValues(((global::System.Collections.Generic.IReadOnlyList<global::Samples.Models.Cat>)result.Cats), (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response);
if ((response.Headers.TryGetValue("nextCat", out string value) && !string.IsNullOrEmpty(value)))
{
nextPage = new global::System.Uri(value);
nextPage = new global::System.Uri(value, global::System.UriKind.RelativeOrAbsolute);
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions .../Providers/CollectionResultDefinitions/TestData/NextLinkTests/NextLinkInHeaderOfTAsync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ public CatClientGetCatsAsyncCollectionResultOfT(global::Samples.CatClient client
yield break;
}
global::Samples.Models.Page result = ((global::Samples.Models.Page)response);
yield return global::Azure.Page<global::Samples.Models.Cat>.FromValues(((global::System.Collections.Generic.IReadOnlyList<global::Samples.Models.Cat>)result.Cats), nextPage?.AbsoluteUri, response);
yield return global::Azure.Page<global::Samples.Models.Cat>.FromValues(((global::System.Collections.Generic.IReadOnlyList<global::Samples.Models.Cat>)result.Cats), (nextPage?.IsAbsoluteUri == true) ? nextPage.AbsoluteUri : nextPage?.OriginalString, response);
if ((response.Headers.TryGetValue("nextCat", out string value) && !string.IsNullOrEmpty(value)))
{
nextPage = new global::System.Uri(value);
nextPage = new global::System.Uri(value, global::System.UriKind.RelativeOrAbsolute);
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion ...erated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkAsyncCollectionResult.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...ted/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkAsyncCollectionResultOfT.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...c/Generated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkCollectionResult.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...enerated/CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkCollectionResultOfT.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...ectionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageAsyncCollectionResult.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...ionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageAsyncCollectionResultOfT.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .../CollectionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageCollectionResult.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...llectionResults/BasicTypeSpecClientGetWithHeaderNextLinkWithMaxPageCollectionResultOfT.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...rc/Generated/CollectionResults/BasicTypeSpecClientGetWithNextLinkAsyncCollectionResult.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...Generated/CollectionResults/BasicTypeSpecClientGetWithNextLinkAsyncCollectionResultOfT.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...pec/src/Generated/CollectionResults/BasicTypeSpecClientGetWithNextLinkCollectionResult.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading