Skip to content

Commit 8ec7456

Browse files
fabiocavfabiocav
committed
Renaming FunctionExecutionContext
1 parent 9b934bb commit 8ec7456

Some content is hidden

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

48 files changed

+184
-156
lines changed

‎NuGet.Config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
5+
</packageSources>
6+
</configuration>

‎samples/FunctionApp/Function1/Function1.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public static class Function1
2020
[QueueOutput("book", "functionstesting2", Connection = "AzureWebJobsStorage")]
2121
public static HttpResponseData Run(
2222
[HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)] HttpRequestData req,
23-
[BlobInput("test-samples/sample1.txt", Connection = "AzureWebJobsStorage")] string myBlob, FunctionExecutionContext context)
23+
[BlobInput("test-samples/sample1.txt", Connection = "AzureWebJobsStorage")] string myBlob, FunctionContext context)
2424
{
2525
var bookVal = (Book)JsonSerializer.Deserialize(myBlob, typeof(Book));
2626
context.OutputBindings["book"] = bookVal;

‎samples/FunctionApp/Function3/Function3.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static class Function3
1616
[FunctionName("Function3")]
1717
[QueueOutput("name", "functionstesting2", Connection = "AzureWebJobsStorage")]
1818
public static HttpResponseData Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)] HttpRequestData req,
19-
FunctionExecutionContext context)
19+
FunctionContext context)
2020
{
2121
var response = new HttpResponseData(HttpStatusCode.OK);
2222
response.Body = "Success!!";

‎samples/FunctionApp/Function4/Function4.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ public static class Function4
1515
{
1616

1717
[FunctionName("Function4")]
18-
public static HttpResponseData Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)] HttpRequestData req,
19-
FunctionExecutionContext executionContext)
18+
public static HttpResponseData Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)] HttpRequestData req, FunctionContext executionContext)
2019
{
2120
var logger = executionContext.Logger;
2221
logger.LogInformation("message logged");

‎samples/FunctionApp/Function5/Function5.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ public Function5(IHttpResponderService responderService)
2121
}
2222

2323
[FunctionName(nameof(Function5))]
24-
public HttpResponseData Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)] HttpRequestData req,
25-
FunctionExecutionContext executionContext)
24+
public HttpResponseData Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)] HttpRequestData req, FunctionContext executionContext)
2625
{
2726
var logger = executionContext.Logger;
2827
logger.LogInformation("message logged");

‎samples/SampleApp/Blob/BlobFunction.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the MIT License. See License.txt in the project root for license information.
33

4-
 using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
4+
using Microsoft.Azure.Functions.Worker;
5+
using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
56
using Microsoft.Azure.Functions.Worker.Extensions.Storage;
6-
using Microsoft.Azure.Functions.Worker.Pipeline;
77
using Microsoft.Extensions.Logging;
88

99
namespace SampleApp
@@ -15,7 +15,7 @@ public static class BlobFunction
1515
public static void Run(
1616
[BlobTrigger("test-samples-trigger/{name}", Connection = "AzureWebJobsStorage")] string myTriggerItem,
1717
[BlobInput("test-samples-input/sample1.txt", Connection = "AzureWebJobsStorage")] string myBlob,
18-
FunctionExecutionContext context)
18+
FunctionContext context)
1919
{
2020
var logger = context.Logger;
2121
logger.LogInformation($"Triggered Item = {myTriggerItem}");

‎samples/SampleApp/CosmosDB/CosmosDBFunction.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the MIT License. See License.txt in the project root for license information.
33

44
using System.Collections.Generic;
55
using System.Linq;
6+
using Microsoft.Azure.Functions.Worker;
67
using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
78
using Microsoft.Azure.Functions.Worker.Extensions.CosmosDB;
8-
using Microsoft.Azure.Functions.Worker.Pipeline;
99
using Microsoft.Extensions.Logging;
1010

1111
namespace SampleApp
@@ -17,7 +17,7 @@ public static class CosmosDBFunction
1717
public static void Run(
1818
[CosmosDBTrigger("%CosmosDb%", "%CosmosCollIn%", ConnectionStringSetting = "CosmosConnection",
1919
LeaseCollectionName = "leases", CreateLeaseCollectionIfNotExists = true)] IReadOnlyList<MyDocument> input,
20-
FunctionExecutionContext context)
20+
FunctionContext context)
2121
{
2222
var logger = context.Logger;
2323

‎samples/SampleApp/DependencyInjection/DependencyInjectionFunction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public DependencyInjectionFunction(IHttpResponderService responderService)
2222

2323
[FunctionName(nameof(DependencyInjectionFunction))]
2424
public HttpResponseData Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)] HttpRequestData req,
25-
FunctionExecutionContext executionContext)
25+
FunctionContext executionContext)
2626
{
2727
var logger = executionContext.Logger;
2828
logger.LogInformation("message logged");

‎samples/SampleApp/EventGrid/EventGridFunction.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the MIT License. See License.txt in the project root for license information.
33

44
using System.Collections.Generic;
5+
using Microsoft.Azure.Functions.Worker;
56
using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
67
using Microsoft.Azure.Functions.Worker.Extensions.EventGrid;
7-
using Microsoft.Azure.Functions.Worker.Pipeline;
88
using Microsoft.Extensions.Logging;
99

1010
namespace SampleApp
@@ -13,7 +13,7 @@ public static class EventGridFunction
1313
{
1414
[FunctionName("EventGridFunction")]
1515
[EventGridOutput("output", TopicEndpointUri = "MyEventGridTopicUriSetting", TopicKeySetting = "MyEventGridTopicKeySetting")]
16-
public static void Run([EventGridTrigger] MyEventType input, FunctionExecutionContext context)
16+
public static void Run([EventGridTrigger] MyEventType input, FunctionContext context)
1717
{
1818
var logger = context.Logger;
1919

‎samples/SampleApp/EventHubs/EventHubsFunction.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the MIT License. See License.txt in the project root for license information.
33

44
using System;
5+
using Microsoft.Azure.Functions.Worker;
56
using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
67
using Microsoft.Azure.Functions.Worker.Extensions.EventHubs;
7-
using Microsoft.Azure.Functions.Worker.Pipeline;
88
using Microsoft.Extensions.Logging;
99

1010
namespace SampleApp
@@ -14,7 +14,7 @@ public static class EventHubsFunction
1414
[FunctionName("EventHubsFunction")]
1515
[EventHubOutput("myOutput", "dest", Connection = "EventHubConnectionAppSetting")]
1616
public static void Run([EventHubTrigger("src", Connection = "EventHubConnectionAppSetting")] string input,
17-
FunctionExecutionContext context)
17+
FunctionContext context)
1818
{
1919
var logger = context.Logger;
2020

‎samples/SampleApp/Http/HttpFunction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static class HttpFunction
1515
{
1616
[FunctionName("HttpFunction")]
1717
public static HttpResponseData Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)] HttpRequestData req,
18-
FunctionExecutionContext executionContext)
18+
FunctionContext executionContext)
1919
{
2020
var logger = executionContext.Logger;
2121
logger.LogInformation("message logged");

‎samples/SampleApp/Kafka/KafkaFunction.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the MIT License. See License.txt in the project root for license information.
33

44
using System;
5+
using Microsoft.Azure.Functions.Worker;
56
using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
67
using Microsoft.Azure.Functions.Worker.Extensions.Kafka;
7-
using Microsoft.Azure.Functions.Worker.Pipeline;
88
using Microsoft.Extensions.Logging;
99

1010
namespace SampleApp
@@ -15,7 +15,7 @@ public static class KafkaFunction
1515
[KafkaOutput("myOutput", "LocalBroker", "stringTopicTenPartitions")]
1616
public static void Run([KafkaTrigger("LocalBroker", "stringTopicTenPartitions",
1717
ConsumerGroup = "$Default", AuthenticationMode = BrokerAuthenticationMode.Plain)] string input,
18-
FunctionExecutionContext context)
18+
FunctionContext context)
1919
{
2020
var logger = context.Logger;
2121

‎samples/SampleApp/Queue/QueueFunction.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the MIT License. See License.txt in the project root for license information.
33

4+
using Microsoft.Azure.Functions.Worker;
45
using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
56
using Microsoft.Azure.Functions.Worker.Extensions.Storage;
6-
using Microsoft.Azure.Functions.Worker.Pipeline;
77
using Microsoft.Extensions.Logging;
88

99
namespace SampleApp
@@ -13,7 +13,7 @@ public static class QueueFunction
1313
[FunctionName("QueueFunction")]
1414
[QueueOutput("output", "functionstesting2", Connection = "AzureWebJobsStorage")]
1515
public static void Run([QueueTrigger("functionstesting2", Connection = "AzureWebJobsStorage")] Book myQueueItem,
16-
FunctionExecutionContext context)
16+
FunctionContext context)
1717
{
1818
var logger = context.Logger;
1919
logger.LogInformation($"Book name = {myQueueItem.Name}");

‎samples/SampleApp/RabbitMQ/RabbitMQFunction.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the MIT License. See License.txt in the project root for license information.
33

44
using System;
5+
using Microsoft.Azure.Functions.Worker;
56
using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
67
using Microsoft.Azure.Functions.Worker.Extensions.RabbitMQ;
7-
using Microsoft.Azure.Functions.Worker.Pipeline;
88
using Microsoft.Extensions.Logging;
99

1010
namespace SampleApp
@@ -14,7 +14,7 @@ public static class RabbitMQFunction
1414
[FunctionName("RabbitMQFunction")]
1515
[RabbitMQOutput("rabbitOutput", QueueName = "destinationQueue", ConnectionStringSetting = "rabbitMQConnectionAppSetting")]
1616
public static void Run([RabbitMQTrigger("queue", ConnectionStringSetting = "rabbitMQConnectionAppSetting")] string item,
17-
FunctionExecutionContext context)
17+
FunctionContext context)
1818
{
1919
var logger = context.Logger;
2020

‎samples/SampleApp/ServiceBus/ServiceBusFunction.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the MIT License. See License.txt in the project root for license information.
33

44
using System;
5+
using Microsoft.Azure.Functions.Worker;
56
using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
67
using Microsoft.Azure.Functions.Worker.Extensions.ServiceBus;
7-
using Microsoft.Azure.Functions.Worker.Pipeline;
88
using Microsoft.Extensions.Logging;
99

1010
namespace SampleApp
@@ -14,7 +14,7 @@ public static class ServiceBusFunction
1414
[FunctionName("ServiceBusFunction")]
1515
[ServiceBusOutput("output", "outputQueue", Connection = "ServiceBusConnection")]
1616
public static void Run([ServiceBusTrigger("queue", Connection = "ServiceBusConnection")] string item,
17-
FunctionExecutionContext context)
17+
FunctionContext context)
1818
{
1919
var logger = context.Logger;
2020

‎samples/SampleApp/SignalR/SignalRFunction.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the MIT License. See License.txt in the project root for license information.
33

44
using System;
5+
using Microsoft.Azure.Functions.Worker;
56
using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
67
using Microsoft.Azure.Functions.Worker.Extensions.SignalRService;
7-
using Microsoft.Azure.Functions.Worker.Pipeline;
88
using Microsoft.Extensions.Logging;
99

1010
namespace SampleApp
@@ -16,7 +16,7 @@ public static class SignalRFunction
1616
public static void Run([SignalRTrigger("SignalRTest", "messages", "SendMessage", parameterNames: new string[] { "message" },
1717
ConnectionStringSetting = "SignalRConnectionString")] string item,
1818
[SignalRConnectionInfoInput(HubName = "chat")] MyConnectionInfo connectionInfo,
19-
FunctionExecutionContext context)
19+
FunctionContext context)
2020
{
2121
var logger = context.Logger;
2222

‎samples/SampleApp/Table/TableFunction.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the MIT License. See License.txt in the project root for license information.
33

44
using System;
5+
using Microsoft.Azure.Functions.Worker;
56
using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
67
using Microsoft.Azure.Functions.Worker.Extensions.Storage;
7-
using Microsoft.Azure.Functions.Worker.Pipeline;
88
using Microsoft.Extensions.Logging;
99
using Newtonsoft.Json.Linq;
1010

@@ -16,7 +16,7 @@ public static class TableFunction
1616
[TableOutput("output", "outputQueue", Connection = "ServiceBusConnection")]
1717
public static void Run([QueueTrigger("table-items")] string input,
1818
[TableInput("MyTable", "MyPartition", "{queueTrigger}")] JObject tableItem,
19-
FunctionExecutionContext context)
19+
FunctionContext context)
2020
{
2121
var logger = context.Logger;
2222

‎samples/SampleApp/Timer/TimerFunction.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the MIT License. See License.txt in the project root for license information.
33

4-
using System;
4+
using System;
5+
using Microsoft.Azure.Functions.Worker;
56
using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
67
using Microsoft.Azure.Functions.Worker.Extensions.Timer;
7-
using Microsoft.Azure.Functions.Worker.Pipeline;
88
using Microsoft.Extensions.Logging;
99

1010
namespace SampleApp
@@ -13,7 +13,7 @@ public static class TimerFunction
1313
{
1414
[FunctionName("TimerFunction")]
1515
public static void Run([TimerTrigger("0 */5 * * * *")] MyInfo timerInfo,
16-
FunctionExecutionContext context)
16+
FunctionContext context)
1717
{
1818
var logger = context.Logger;
1919
logger.LogInformation($"Function Ran. Next timer schedule = {timerInfo.ScheduleStatus.Next}");

‎samples/SampleApp/Warmup/Warmup.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the MIT License. See License.txt in the project root for license information.
33

4-
using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
4+
using Microsoft.Azure.Functions.Worker;
5+
using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
56
using Microsoft.Azure.Functions.Worker.Extensions.Warmup;
6-
using Microsoft.Azure.Functions.Worker.Pipeline;
77
using Microsoft.Extensions.Logging;
88

99
namespace SampleApp
1010
{
1111
public static class Warmup
1212
{
1313
[FunctionName("Warmup")]
14-
public static void Run([WarmupTrigger] object _, FunctionExecutionContext context)
14+
public static void Run([WarmupTrigger] object _, FunctionContext context)
1515
{
1616
var logger = context.Logger;
1717

‎src/DotNetWorker/Broker/FunctionBroker.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ internal class FunctionBroker : IFunctionBroker
1515
{
1616
private readonly ConcurrentDictionary<string, FunctionDefinition> _functionMap = new ConcurrentDictionary<string, FunctionDefinition>();
1717
private readonly FunctionExecutionDelegate _functionExecutionDelegate;
18-
private readonly IFunctionExecutionContextFactory _functionExecutionContextFactory;
18+
private readonly IFunctionContextFactory _functionContextFactory;
1919
private readonly IFunctionDefinitionFactory _functionDescriptorFactory;
2020

21-
public FunctionBroker(FunctionExecutionDelegate functionExecutionDelegate, IFunctionExecutionContextFactory functionExecutionContextFactory, IFunctionDefinitionFactory functionDescriptorFactory)
21+
public FunctionBroker(FunctionExecutionDelegate functionExecutionDelegate, IFunctionContextFactory functionContextFactory, IFunctionDefinitionFactory functionDescriptorFactory)
2222
{
2323
_functionExecutionDelegate = functionExecutionDelegate ?? throw new ArgumentNullException(nameof(functionExecutionDelegate));
24-
_functionExecutionContextFactory = functionExecutionContextFactory ?? throw new ArgumentNullException(nameof(functionExecutionContextFactory));
24+
_functionContextFactory = functionContextFactory ?? throw new ArgumentNullException(nameof(functionContextFactory));
2525
_functionDescriptorFactory = functionDescriptorFactory ?? throw new ArgumentNullException(nameof(functionDescriptorFactory));
2626
}
2727

@@ -46,11 +46,11 @@ public async Task<InvocationResponse> InvokeAsync(FunctionInvocation invocation)
4646
InvocationId = invocation.InvocationId
4747
};
4848

49-
FunctionExecutionContext? executionContext = null;
49+
FunctionContext? executionContext = null;
5050

5151
try
5252
{
53-
executionContext = _functionExecutionContextFactory.Create(invocation, _functionMap[invocation.FunctionId]);
53+
executionContext = _functionContextFactory.Create(invocation, _functionMap[invocation.FunctionId]);
5454

5555
await _functionExecutionDelegate(executionContext);
5656

‎src/DotNetWorker/Configuration/FunctionsWorkerApplicationBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ namespace Microsoft.Azure.Functions.Worker.Configuration
99
{
1010
internal class FunctionsWorkerApplicationBuilder : IFunctionsWorkerApplicationBuilder
1111
{
12-
private readonly IInvocationPipelineBuilder<FunctionExecutionContext> _pipelineBuilder;
12+
private readonly IInvocationPipelineBuilder<FunctionContext> _pipelineBuilder;
1313

1414
public IServiceCollection Services { get; private set; }
1515

1616
public FunctionsWorkerApplicationBuilder(IServiceCollection services)
1717
{
1818
Services = services;
19-
_pipelineBuilder = new DefaultInvocationPipelineBuilder<FunctionExecutionContext>();
19+
_pipelineBuilder = new DefaultInvocationPipelineBuilder<FunctionContext>();
2020
Services.AddSingleton<FunctionExecutionDelegate>(sp =>
2121
{
2222
return _pipelineBuilder.Build();

‎src/DotNetWorker/Configuration/ServiceCollectionExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static IFunctionsWorkerApplicationBuilder AddFunctionsWorker(this IServic
4141
services.AddSingleton<IFunctionExecutor, DefaultFunctionExecutor>();
4242

4343
// Function Execution Contexts
44-
services.AddSingleton<IFunctionExecutionContextFactory, DefaultFunctionExecutionContextFactory>();
44+
services.AddSingleton<IFunctionContextFactory, DefaultFunctionContextFactory>();
4545

4646
// Function Definition
4747
services.AddSingleton<IFunctionDefinitionFactory, DefaultFunctionDefinitionFactory>();

0 commit comments

Comments
 (0)