Skip to content

Commit e2024fb

Browse files
API updates for SB extension (Azure#24678)
1 parent 9fc0155 commit e2024fb

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/api/Microsoft.Azure.WebJobs.Extensions.ServiceBus.netstandard2.0.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace Microsoft.Azure.WebJobs.ServiceBus
3838
{
3939
public partial class MessageProcessor
4040
{
41-
public MessageProcessor(Azure.Messaging.ServiceBus.ServiceBusProcessor processor) { }
41+
protected internal MessageProcessor(Azure.Messaging.ServiceBus.ServiceBusProcessor processor) { }
4242
protected internal Azure.Messaging.ServiceBus.ServiceBusProcessor Processor { get { throw null; } }
4343
protected internal virtual System.Threading.Tasks.Task<bool> BeginProcessingMessageAsync(Microsoft.Azure.WebJobs.ServiceBus.ServiceBusMessageActions actions, Azure.Messaging.ServiceBus.ServiceBusReceivedMessage message, System.Threading.CancellationToken cancellationToken) { throw null; }
4444
protected internal virtual System.Threading.Tasks.Task CompleteProcessingMessageAsync(Microsoft.Azure.WebJobs.ServiceBus.ServiceBusMessageActions actions, Azure.Messaging.ServiceBus.ServiceBusReceivedMessage message, Microsoft.Azure.WebJobs.Host.Executors.FunctionResult result, System.Threading.CancellationToken cancellationToken) { throw null; }
@@ -74,7 +74,6 @@ public partial class ServiceBusOptions : Microsoft.Azure.WebJobs.Hosting.IOption
7474
public ServiceBusOptions() { }
7575
public bool AutoCompleteMessages { get { throw null; } set { } }
7676
public Azure.Messaging.ServiceBus.ServiceBusRetryOptions ClientRetryOptions { get { throw null; } set { } }
77-
public System.Func<Azure.Messaging.ServiceBus.ProcessErrorEventArgs, System.Threading.Tasks.Task> ExceptionHandler { get { throw null; } set { } }
7877
public Newtonsoft.Json.JsonSerializerSettings JsonSerializerSettings { get { throw null; } set { } }
7978
public System.TimeSpan MaxAutoLockRenewalDuration { get { throw null; } set { } }
8079
public int MaxConcurrentCalls { get { throw null; } set { } }
@@ -94,10 +93,10 @@ internal ServiceBusSessionMessageActions() { }
9493
}
9594
public partial class SessionMessageProcessor
9695
{
97-
public SessionMessageProcessor(Azure.Messaging.ServiceBus.ServiceBusSessionProcessor processor) { }
96+
protected internal SessionMessageProcessor(Azure.Messaging.ServiceBus.ServiceBusSessionProcessor processor) { }
9897
protected internal Azure.Messaging.ServiceBus.ServiceBusSessionProcessor Processor { get { throw null; } }
99-
public virtual System.Threading.Tasks.Task<bool> BeginProcessingMessageAsync(Microsoft.Azure.WebJobs.ServiceBus.ServiceBusSessionMessageActions actions, Azure.Messaging.ServiceBus.ServiceBusReceivedMessage message, System.Threading.CancellationToken cancellationToken) { throw null; }
100-
public virtual System.Threading.Tasks.Task CompleteProcessingMessageAsync(Microsoft.Azure.WebJobs.ServiceBus.ServiceBusSessionMessageActions actions, Azure.Messaging.ServiceBus.ServiceBusReceivedMessage message, Microsoft.Azure.WebJobs.Host.Executors.FunctionResult result, System.Threading.CancellationToken cancellationToken) { throw null; }
98+
protected internal virtual System.Threading.Tasks.Task<bool> BeginProcessingMessageAsync(Microsoft.Azure.WebJobs.ServiceBus.ServiceBusSessionMessageActions actions, Azure.Messaging.ServiceBus.ServiceBusReceivedMessage message, System.Threading.CancellationToken cancellationToken) { throw null; }
99+
protected internal virtual System.Threading.Tasks.Task CompleteProcessingMessageAsync(Microsoft.Azure.WebJobs.ServiceBus.ServiceBusSessionMessageActions actions, Azure.Messaging.ServiceBus.ServiceBusReceivedMessage message, Microsoft.Azure.WebJobs.Host.Executors.FunctionResult result, System.Threading.CancellationToken cancellationToken) { throw null; }
101100
}
102101
}
103102
namespace Microsoft.Extensions.Hosting

sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public int MaxConcurrentSessions
128128
/// Gets or sets an optional exception handler that will be invoked if an exception occurs while attempting to process
129129
/// a message. This does not apply for functions that receive a batch of messages.
130130
/// </summary>
131-
public Func<ProcessErrorEventArgs, Task> ExceptionHandler { get; set; }
131+
internal Func<ProcessErrorEventArgs, Task> ExceptionHandler { get; set; }
132132

133133
/// <summary>
134134
/// Gets or sets the maximum number of messages that will be passed to each function call. This only applies for functions that receive

sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Primitives/MessageProcessor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class MessageProcessor
1818
/// Initializes a new instance of <see cref="MessageProcessor"/>.
1919
/// </summary>
2020
/// <param name="processor">The <see cref="ServiceBusProcessor"/> to use for processing messages from Service Bus.</param>
21-
public MessageProcessor(ServiceBusProcessor processor)
21+
protected internal MessageProcessor(ServiceBusProcessor processor)
2222
{
2323
Processor = processor ?? throw new ArgumentNullException(nameof(processor));
2424
}

sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Primitives/SessionMessageProcessor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class SessionMessageProcessor
1515
/// Initializes a new instance of <see cref="SessionMessageProcessor"/>.
1616
/// </summary>
1717
/// <param name="processor">The <see cref="ServiceBusSessionProcessor"/> to use for processing messages from Service Bus.</param>
18-
public SessionMessageProcessor(ServiceBusSessionProcessor processor)
18+
protected internal SessionMessageProcessor(ServiceBusSessionProcessor processor)
1919
{
2020
Processor = processor ?? throw new ArgumentNullException(nameof(processor));
2121
}
@@ -33,7 +33,7 @@ public SessionMessageProcessor(ServiceBusSessionProcessor processor)
3333
/// <param name="message">The <see cref="ServiceBusReceivedMessage"/> to process.</param>
3434
/// <param name="cancellationToken">The <see cref="CancellationToken"/> to use.</param>
3535
/// <returns>A <see cref="Task"/> that returns true if the message processing should continue, false otherwise.</returns>
36-
public virtual Task<bool> BeginProcessingMessageAsync(ServiceBusSessionMessageActions actions, ServiceBusReceivedMessage message, CancellationToken cancellationToken)
36+
protected internal virtual Task<bool> BeginProcessingMessageAsync(ServiceBusSessionMessageActions actions, ServiceBusReceivedMessage message, CancellationToken cancellationToken)
3737
{
3838
return Task.FromResult<bool>(true);
3939
}
@@ -51,7 +51,7 @@ public virtual Task<bool> BeginProcessingMessageAsync(ServiceBusSessionMessageAc
5151
/// <param name="result">The <see cref="FunctionResult"/> from the job invocation.</param>
5252
/// <param name="cancellationToken">The <see cref="CancellationToken"/> to use</param>
5353
/// <returns>A <see cref="Task"/> that will complete the message processing.</returns>
54-
public virtual Task CompleteProcessingMessageAsync(ServiceBusSessionMessageActions actions, ServiceBusReceivedMessage message, FunctionResult result, CancellationToken cancellationToken)
54+
protected internal virtual Task CompleteProcessingMessageAsync(ServiceBusSessionMessageActions actions, ServiceBusReceivedMessage message, FunctionResult result, CancellationToken cancellationToken)
5555
{
5656
if (result == null)
5757
{

sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/ServiceBusSessionsEndToEndTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -826,15 +826,15 @@ public CustomSessionMessageProcessor(
826826
_logger = logger;
827827
}
828828

829-
public override async Task<bool> BeginProcessingMessageAsync(
829+
protected internal override async Task<bool> BeginProcessingMessageAsync(
830830
ServiceBusSessionMessageActions actions,
831831
ServiceBusReceivedMessage message, CancellationToken cancellationToken)
832832
{
833833
_logger?.LogInformation("Custom processor Begin called!" + message.Body.ToString());
834834
return await base.BeginProcessingMessageAsync(actions, message, cancellationToken);
835835
}
836836

837-
public override async Task CompleteProcessingMessageAsync(
837+
protected internal override async Task CompleteProcessingMessageAsync(
838838
ServiceBusSessionMessageActions actions,
839839
ServiceBusReceivedMessage message,
840840
Executors.FunctionResult result,

0 commit comments

Comments
 (0)