Skip to content

Adding support for JObject[] #832

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
ealsur merged 7 commits into from
Feb 27, 2023
Merged

Adding support for JObject[] #832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2fc2e61
Support jobject a
ealsur Feb 27, 2023
c4979ee
tests
ealsur Feb 27, 2023
84c7221
version bump
ealsur Feb 27, 2023
a797c6f
Adding a change
ealsur Feb 27, 2023
8c052bd
undo to trigger CI
ealsur Feb 27, 2023
be3fda0
change to trigger CI
ealsur Feb 27, 2023
413c1fe
change to trigger CI
ealsur Feb 27, 2023
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
2 changes: 1 addition & 1 deletion build/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- Extensions can have independent versions and only increment when released -->
<Version>3.0.0$(VersionSuffix)</Version>
<ExtensionsVersion>5.0.0-beta.2$(VersionSuffix)</ExtensionsVersion> <!-- WebJobs.Extensions -->
<CosmosDBVersion>4.1.0$(VersionSuffix)</CosmosDBVersion>
<CosmosDBVersion>4.1.1$(VersionSuffix)</CosmosDBVersion>
<HttpVersion>3.2.0$(VersionSuffix)</HttpVersion>
<MobileAppsVersion>3.0.0$(VersionSuffix)</MobileAppsVersion>
<SendGridVersion>3.0.3$(VersionSuffix)</SendGridVersion>
Expand Down
3 changes: 2 additions & 1 deletion src/WebJobs.Extensions.CosmosDB/Trigger/CosmosDBTriggerAttributeBindingProviderGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public Task<ITriggerBinding> TryCreateAsync(TriggerBindingProviderContext contex

Type documentType = CosmosDBTriggerAttributeBindingProviderGenerator.GetParameterType(context.Parameter);

if (typeof(JArray).IsAssignableFrom(documentType))
if (typeof(JArray).IsAssignableFrom(documentType)
|| typeof(JObject[]).IsAssignableFrom(documentType))
{
documentType = typeof(JObject); // When binding to JArray, use JObject as contract.
}
Expand Down
21 changes: 18 additions & 3 deletions ...WebJobs.Extensions.CosmosDB.Tests/Trigger/CosmosDBTriggerAttributeBindingProviderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,10 @@ public static void Func3([CosmosDBTrigger("%aDatabase%", "%aCollection%", Connec
{
}

public static void Func4([CosmosDBTrigger("%aDatabase%", "%aCollection%", Connection = "CosmosDBConnectionString")] JObject[] docs)
{
}

public static IEnumerable<ParameterInfo[]> GetParameters()
{
var type = typeof(ValidCosmosDBTriggerBindingsWithAppSettings);
Expand All @@ -611,7 +615,8 @@ public static IEnumerable<ParameterInfo[]> GetParameters()
{
new[] { GetFirstParameter(type, "Func1") },
new[] { GetFirstParameter(type, "Func2") },
new[] { GetFirstParameter(type, "Func3") }
new[] { GetFirstParameter(type, "Func3") },
new[] { GetFirstParameter(type, "Func4") }
};
}
}
Expand Down Expand Up @@ -648,6 +653,10 @@ public static void Func2([CosmosDBTrigger("aDatabase", "aCollection")] JArray do
{
}

public static void Func4([CosmosDBTrigger("aDatabase", "aCollection")] JObject[] docs)
{
}

public static void Func3([CosmosDBTrigger("aDatabase", "aCollection", LeaseDatabaseName = "aDatabase", LeaseContainerName = "aLeaseCollection")] IReadOnlyList<dynamic> docs)
{
}
Expand All @@ -660,7 +669,8 @@ public static IEnumerable<ParameterInfo[]> GetParameters()
{
new[] { GetFirstParameter(type, "Func1") },
new[] { GetFirstParameter(type, "Func2") },
new[] { GetFirstParameter(type, "Func3") }
new[] { GetFirstParameter(type, "Func3") },
new[] { GetFirstParameter(type, "Func4") }
};
}
}
Expand All @@ -675,6 +685,10 @@ public static void Func2([CosmosDBTrigger("%aDatabase%-test", "%aCollection%-tes
{
}

public static void Func4([CosmosDBTrigger("%aDatabase%-test", "%aCollection%-test")] JObject[] docs)
{
}

public static void Func3([CosmosDBTrigger("%aDatabase%-test", "%aCollection%-test", LeaseDatabaseName = "%aDatabase%-test")] IReadOnlyList<dynamic> docs)
{
}
Expand All @@ -687,7 +701,8 @@ public static IEnumerable<ParameterInfo[]> GetParameters()
{
new[] { GetFirstParameter(type, "Func1") },
new[] { GetFirstParameter(type, "Func2") },
new[] { GetFirstParameter(type, "Func3") }
new[] { GetFirstParameter(type, "Func3") },
new[] { GetFirstParameter(type, "Func4") }
};
}
}
Expand Down