Skip to content

Commit 69e43d4

Browse files
danielmarbachbording
danielmarbach
and
bording
authored
Obsolete APIs (#2829)
* Obsolete APIs Co-authored-by: Brandon Ording <bording@gmail.com> * Bump minver version --------- Co-authored-by: Daniel Marbach <danielmarbach@users.noreply.github.com> Co-authored-by: Brandon Ording <bording@gmail.com>
1 parent a38e745 commit 69e43d4

8 files changed

+27
-162
lines changed

‎src/Custom.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<MinVerMinimumMajorMinor>7.0</MinVerMinimumMajorMinor>
4+
<MinVerMinimumMajorMinor>8.0</MinVerMinimumMajorMinor>
55
<MinVerAutoIncrement>minor</MinVerAutoIncrement>
66
</PropertyGroup>
77

‎src/NServiceBus.Transport.SQS.AcceptanceTests/NativePubSub/HybridModeRateLimit/TestCase.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class TestCase
88

99
public int NumberOfEvents { get; internal set; }
1010
public TimeSpan? TestExecutionTimeout { get; internal set; }
11-
public int MessageVisibilityTimeout { get; internal set; } = DefaultMessageVisibilityTimeout;
11+
public TimeSpan MessageVisibilityTimeout { get; internal set; } = DefaultMessageVisibilityTimeout;
1212
public TimeSpan SubscriptionsCacheTTL { get; internal set; } = DefaultSubscriptionCacheTTL;
1313
public TimeSpan NotFoundTopicsCacheTTL { get; internal set; } = DefaultTopicCacheTTL;
1414
public bool PreDeployInfrastructure { get; internal set; } = DefaultPreDeployInfrastructure;
@@ -24,7 +24,7 @@ public override string ToString() => $"#{Sequence}, " +
2424

2525
static TimeSpan DefaultSubscriptionCacheTTL = TimeSpan.FromSeconds(5);
2626
static TimeSpan DefaultTopicCacheTTL = TimeSpan.FromSeconds(5);
27-
static int DefaultMessageVisibilityTimeout = 30;
27+
static TimeSpan DefaultMessageVisibilityTimeout = TimeSpan.FromSeconds(30);
2828
static int DefaultDeployInfrastructureDelay = 65000;
2929
static bool DefaultPreDeployInfrastructure = true;
3030
}

‎src/NServiceBus.Transport.SQS.AcceptanceTests/NativePubSub/HybridModeRateLimit/When_publishing_one_event_type_to_native_and_non_native_subscribers_in_a_loop_in_the_context_of_incoming_message.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ public class When_publishing_one_event_type_to_native_and_non_native_subscribers
2626
new TestCase(5)
2727
{
2828
NumberOfEvents = 1000,
29-
MessageVisibilityTimeout = 180,
29+
MessageVisibilityTimeout = TimeSpan.FromMinutes(3),
3030
TestExecutionTimeout = TimeSpan.FromMinutes(3),
3131
SubscriptionsCacheTTL = TimeSpan.FromMinutes(1),
3232
NotFoundTopicsCacheTTL = TimeSpan.FromMinutes(1),
3333
},
3434
new TestCase(6)
3535
{
3636
NumberOfEvents = 3000,
37-
MessageVisibilityTimeout = 300,
37+
MessageVisibilityTimeout = TimeSpan.FromMinutes(5),
3838
TestExecutionTimeout = TimeSpan.FromMinutes(7),
3939
SubscriptionsCacheTTL = TimeSpan.FromMinutes(2),
4040
NotFoundTopicsCacheTTL = TimeSpan.FromMinutes(2),
@@ -75,7 +75,7 @@ public async Task Should_not_rate_exceed(TestCase testCase)
7575
var migrationMode = config.ConfigureRouting().EnableMessageDrivenPubSubCompatibilityMode();
7676
migrationMode.SubscriptionsCacheTTL(testCase.SubscriptionsCacheTTL);
7777
migrationMode.TopicCacheTTL(testCase.NotFoundTopicsCacheTTL);
78-
migrationMode.MessageVisibilityTimeout(testCase.MessageVisibilityTimeout);
78+
config.ConfigureSqsTransport().MessageVisibilityTimeout = testCase.MessageVisibilityTimeout;
7979
});
8080

8181
b.When(c => c.SubscribedMessageDriven && c.SubscribedNative, session

‎src/NServiceBus.Transport.SQS.AcceptanceTests/NativePubSub/HybridModeRateLimit/When_publishing_two_event_types_to_native_and_non_native_subscribers_in_a_loop_in_the_context_of_incoming_message.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class When_publishing_two_event_types_to_native_and_non_native_subscriber
3333
new TestCase(5)
3434
{
3535
NumberOfEvents = 1000,
36-
MessageVisibilityTimeout = 360,
36+
MessageVisibilityTimeout = TimeSpan.FromMinutes(6),
3737
SubscriptionsCacheTTL = TimeSpan.FromSeconds(120),
3838
TestExecutionTimeout = TimeSpan.FromMinutes(8),
3939
NotFoundTopicsCacheTTL = TimeSpan.FromSeconds(120)
@@ -94,7 +94,7 @@ await Task.WhenAll(
9494
var migrationMode = config.ConfigureRouting().EnableMessageDrivenPubSubCompatibilityMode();
9595
migrationMode.SubscriptionsCacheTTL(testCase.SubscriptionsCacheTTL);
9696
migrationMode.TopicCacheTTL(testCase.NotFoundTopicsCacheTTL);
97-
migrationMode.MessageVisibilityTimeout(testCase.MessageVisibilityTimeout);
97+
config.ConfigureSqsTransport().MessageVisibilityTimeout = testCase.MessageVisibilityTimeout;
9898
});
9999

100100
b.When(c => c.SubscribedMessageDrivenToMyEvent && c.SubscribedMessageDrivenToMySecondEvent && c.SubscribedNative, session

‎src/NServiceBus.Transport.SQS.Tests/ApprovalFiles/APIApprovals.ApproveSqsTransport.approved.txt‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,6 @@ namespace NServiceBus
1616
public bool SetupTopicPoliciesWhenSubscribing { get; set; }
1717
public bool TopicNamePrefixCondition { get; set; }
1818
public System.Collections.Generic.List<string> TopicNamespaceConditions { get; }
19-
[System.Obsolete("Use `AccountCondition` instead. The member currently throws a NotImplementedExcep" +
20-
"tion. Will be removed in version 8.0.0.", true)]
21-
public void AddAccountCondition() { }
22-
[System.Obsolete("Use `TopicNamespaceConditions` instead. The member currently throws a NotImplemen" +
23-
"tedException. Will be removed in version 8.0.0.", true)]
24-
public void AddNamespaceCondition(string topicNamespace) { }
25-
[System.Obsolete("Use `TopicNamePrefixCondition` instead. The member currently throws a NotImplemen" +
26-
"tedException. Will be removed in version 8.0.0.", true)]
27-
public void AddTopicNamePrefixCondition() { }
28-
[System.Obsolete("Use `SetupTopicPoliciesWhenSubscribing` instead. The member currently throws a No" +
29-
"tImplementedException. Will be removed in version 8.0.0.", true)]
30-
public void AssumePolicyHasAppropriatePermissions() { }
3119
}
3220
public abstract class S3EncryptionMethod
3321
{
@@ -60,24 +48,12 @@ namespace NServiceBus
6048
public NServiceBus.S3EncryptionMethod Encryption { get; set; }
6149
public string KeyPrefix { get; }
6250
public Amazon.S3.IAmazonS3 S3Client { get; }
63-
[System.Obsolete("Use `Client or S3Settings constructor` instead. The member currently throws a Not" +
64-
"ImplementedException. Will be removed in version 8.0.0.", true)]
65-
public void ClientFactory(System.Func<Amazon.S3.IAmazonS3> factory) { }
66-
[System.Obsolete("Use `Encryption` instead. The member currently throws a NotImplementedException. " +
67-
"Will be removed in version 8.0.0.", true)]
68-
public void ServerSideCustomerEncryption(Amazon.S3.ServerSideEncryptionCustomerMethod encryptionMethod, string providedKey, string providedKeyMD5 = null) { }
69-
[System.Obsolete("Use `Encryption` instead. The member currently throws a NotImplementedException. " +
70-
"Will be removed in version 8.0.0.", true)]
71-
public void ServerSideEncryption(Amazon.S3.ServerSideEncryptionMethod encryptionMethod, string keyManagementServiceKeyId = null) { }
7251
}
7352
public class SqsTransport : NServiceBus.Transport.TransportDefinition
7453
{
7554
public SqsTransport(bool disableUnrestrictedDelayedDelivery = false) { }
7655
public SqsTransport(Amazon.SQS.IAmazonSQS sqsClient, Amazon.SimpleNotificationService.IAmazonSimpleNotificationService snsClient, bool disableUnrestrictedDelayedDelivery = false) { }
7756
public bool DoNotWrapOutgoingMessages { get; set; }
78-
[System.Obsolete("The SQS transport no longer supports 1.x compatibility mode. Will be removed in v" +
79-
"ersion 8.0.0.", true)]
80-
public bool EnableV1CompatibilityMode { get; set; }
8157
public System.TimeSpan MaxAutoMessageVisibilityRenewalDuration { get; set; }
8258
public System.TimeSpan MaxTimeToLive { get; set; }
8359
public System.TimeSpan? MessageVisibilityTimeout { get; set; }
@@ -98,20 +74,12 @@ namespace NServiceBus
9874
public void MapEvent<TSubscribedEvent>(System.Collections.Generic.IEnumerable<string> customTopicsNames) { }
9975
public void MapEvent<TSubscribedEvent>(string customTopicName) { }
10076
public void MapEvent<TSubscribedEvent, TPublishedEvent>() { }
101-
[System.Obsolete("Inject the ITransportAddressResolver type to access the address translation mecha" +
102-
"nism at runtime. See the NServiceBus version 8 upgrade guide for further details" +
103-
". The member currently throws a NotImplementedException. Will be removed in vers" +
104-
"ion 8.0.0.", true)]
105-
public override string ToTransportAddress(NServiceBus.Transport.QueueAddress address) { }
10677
}
10778
public static class SqsTransportSettings
10879
{
10980
public static NServiceBus.TransportExtensions<NServiceBus.SqsTransport> ClientFactory(this NServiceBus.TransportExtensions<NServiceBus.SqsTransport> transportExtensions, System.Func<Amazon.SQS.IAmazonSQS> factory) { }
11081
public static NServiceBus.TransportExtensions<NServiceBus.SqsTransport> ClientFactory(this NServiceBus.TransportExtensions<NServiceBus.SqsTransport> transportExtensions, System.Func<Amazon.SimpleNotificationService.IAmazonSimpleNotificationService> factory) { }
11182
public static NServiceBus.TransportExtensions<NServiceBus.SqsTransport> DoNotWrapOutgoingMessages(this NServiceBus.TransportExtensions<NServiceBus.SqsTransport> transportExtensions) { }
112-
[System.Obsolete("The SQS transport no longer supports 1.x compatibility mode. The member currently" +
113-
" throws a NotImplementedException. Will be removed in version 8.0.0.", true)]
114-
public static NServiceBus.TransportExtensions<NServiceBus.SqsTransport> EnableV1CompatibilityMode(this NServiceBus.TransportExtensions<NServiceBus.SqsTransport> transportExtensions) { }
11583
public static void MapEvent(this NServiceBus.TransportExtensions<NServiceBus.SqsTransport> transportExtensions, System.Type eventType, string customTopicName) { }
11684
public static void MapEvent(this NServiceBus.TransportExtensions<NServiceBus.SqsTransport> transportExtensions, System.Type subscribedEventType, System.Collections.Generic.IEnumerable<string> customTopicsNames) { }
11785
public static void MapEvent(this NServiceBus.TransportExtensions<NServiceBus.SqsTransport> transportExtensions, System.Type subscribedEventType, System.Type publishedEventType) { }
@@ -134,8 +102,8 @@ namespace NServiceBus.Transport.SQS.Configure
134102
{
135103
public class SqsSubscriptionMigrationModeSettings : NServiceBus.SubscriptionMigrationModeSettings
136104
{
137-
[System.Obsolete("Use the SqsTransport.MessageVisibilityTimeout property instead. Will be treated a" +
138-
"s an error from version 8.0.0. Will be removed in version 9.0.0.", false)]
105+
[System.Obsolete("Use the SqsTransport.MessageVisibilityTimeout property instead. The member curren" +
106+
"tly throws a NotImplementedException. Will be removed in version 9.0.0.", true)]
139107
public NServiceBus.SubscriptionMigrationModeSettings MessageVisibilityTimeout(int timeoutInSeconds) { }
140108
public NServiceBus.SubscriptionMigrationModeSettings SubscriptionsCacheTTL(System.TimeSpan ttl) { }
141109
public NServiceBus.Transport.SQS.Configure.SqsSubscriptionMigrationModeSettings TopicCacheTTL(System.TimeSpan ttl) { }

‎src/NServiceBus.Transport.SQS/Configure/SqsSubscriptionMigrationModeSettings.cs‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[PreObsolete("https://github.com/Particular/NServiceBus/issues/6471",
1010
Note = "Hybrid pub/sub support cannot be obsolete until there is a viable migration path to native pub/sub",
1111
Message = "Hybrid pub/sub is no longer supported, use native pub/sub instead")]
12-
public class SqsSubscriptionMigrationModeSettings : SubscriptionMigrationModeSettings
12+
public partial class SqsSubscriptionMigrationModeSettings : SubscriptionMigrationModeSettings
1313
{
1414
SettingsHolder settings;
1515

@@ -40,15 +40,4 @@ public SubscriptionMigrationModeSettings SubscriptionsCacheTTL(TimeSpan ttl)
4040

4141
return this;
4242
}
43-
44-
/// <summary>
45-
/// Overrides the default value specified at the queue level for message visibility timeout.
46-
/// </summary>
47-
/// <param name="timeoutInSeconds">Message visibility timeout.</param>
48-
[ObsoleteEx(Message = "Use the SqsTransport.MessageVisibilityTimeout property instead", TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
49-
public SubscriptionMigrationModeSettings MessageVisibilityTimeout(int timeoutInSeconds)
50-
{
51-
((SqsTransport)settings.Get<TransportDefinition>()).MessageVisibilityTimeout = TimeSpan.FromSeconds(timeoutInSeconds);
52-
return this;
53-
}
5443
}

‎src/NServiceBus.Transport.SQS/obsoletes-v7.cs‎

Lines changed: 0 additions & 108 deletions
This file was deleted.

‎src/NServiceBus.Transport.SQS/obsoletes-v8.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#pragma warning disable 1591
2+
3+
namespace NServiceBus.Transport.SQS.Configure;
4+
5+
using System;
6+
7+
public partial class SqsSubscriptionMigrationModeSettings
8+
{
9+
[ObsoleteEx(Message = "Use the SqsTransport.MessageVisibilityTimeout property instead", TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
10+
public SubscriptionMigrationModeSettings MessageVisibilityTimeout(int timeoutInSeconds)
11+
{
12+
throw new NotImplementedException();
13+
}
14+
}
15+
16+
#pragma warning restore 1591

0 commit comments

Comments
 (0)