Merge pull request #256 from MakingSense/DD-1089-clean-up-obsoletes

[DD-1089] clean up obsoletes
FromDoppler · Dec 27, 2022 · 7d60090 · 7d60090
2 parents bc4d02b + 339b193
commit 7d60090
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 50 deletions.
diff --git a/MailerQ.Test/RestApiClientTest.cs b/MailerQ.Test/RestApiClientTest.cs
@@ -70,12 +70,9 @@ public static IEnumerable<object[]> RestApiModelSpecimens()
             yield return new object[] { specimens.Create<Pause>() };
             yield return new object[] { specimens.Create<Error>() };
             yield return new object[] { specimens.Create<Pool>() };
-            yield return new object[] { specimens.Create<IpPool>() };
             yield return new object[] { specimens.Create<PoolIP>() };
-            yield return new object[] { specimens.Create<IpAddress>() };
             yield return new object[] { specimens.Create<Suppression>() };
             yield return new object[] { specimens.Create<ExternalMTA>() };
-            yield return new object[] { specimens.Create<ExternalIp>() };
         }
 
         public static IEnumerable<object[]> RestApiModelEndpointSpecimens()
@@ -85,12 +82,9 @@ public static IEnumerable<object[]> RestApiModelEndpointSpecimens()
             yield return new object[] { specimens.Create<Pause>(), $"{Version}/pauses" };
             yield return new object[] { specimens.Create<Error>(), $"{Version}/errors" };
             yield return new object[] { specimens.Create<Pool>(), $"{Version}/pools" };
-            yield return new object[] { specimens.Create<IpPool>(), $"{Version}/pools" };
             yield return new object[] { specimens.Create<PoolIP>(), $"{Version}/poolips" };
-            yield return new object[] { specimens.Create<IpAddress>(), $"{Version}/poolips" };
             yield return new object[] { specimens.Create<Suppression>(), $"{Version}/suppressions" };
             yield return new object[] { specimens.Create<ExternalMTA>(), $"{Version}/externalmtas" };
-            yield return new object[] { specimens.Create<ExternalIp>(), $"{Version}/externalmtas" };
         }
 
         [Theory]

diff --git a/MailerQ/Core/IQueueManager.cs b/MailerQ/Core/IQueueManager.cs
diff --git a/MailerQ/Core/QueueManager.cs b/MailerQ/Core/QueueManager.cs
@@ -16,7 +16,7 @@ namespace MailerQ
     /// A queue manager
     /// </summary>
     /// <remarks>Implemented with EasyNetQ</remarks>
-    public class QueueManager : IQueueManager, IQueueDeclarer
+    public class QueueManager : IQueuePublisher, IQueueSubscriber, IQueueDeclarer
     {
         private readonly IAdvancedBus bus;
         private readonly MailerQConfiguration configuration;

diff --git a/MailerQ/RestApi/ExternalMTA.cs b/MailerQ/RestApi/ExternalMTA.cs
@@ -23,17 +23,6 @@ public enum ExternalIpProtocol
         Http,
     }
 
-    /// <summary>
-    /// External MTA.
-    /// Setting to uses IP address that is not local to the server MailerQ is running on.
-    /// </summary>
-    [JsonObject(
-        NamingStrategyType = typeof(LowercaseNamingStrategy),
-        ItemNullValueHandling = NullValueHandling.Ignore
-    )]
-    [Obsolete("User ExternalMTA class")]
-    public class ExternalIp : ExternalMTA { }
-
     /// <summary>
     /// External MTA.
     /// Setting to uses IP address that is not local to the server MailerQ is running on.

diff --git a/MailerQ/RestApi/Pool.cs b/MailerQ/RestApi/Pool.cs
@@ -24,15 +24,4 @@ public class Pool : IRestApiModel
         /// </summary>
         public string Description { get; set; }
     }
-
-    /// <summary>
-    /// Pool of IPs
-    /// MailerQ offers IP Pools for easy management of your sending IP addresses.
-    /// </summary>
-    [JsonObject(
-        NamingStrategyType = typeof(LowercaseNamingStrategy),
-        ItemNullValueHandling = NullValueHandling.Ignore
-    )]
-    [Obsolete("User Pool class")]
-    public class IpPool : Pool { }
 }
diff --git a/MailerQ/RestApi/PoolIP.cs b/MailerQ/RestApi/PoolIP.cs
@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using System;
 
 namespace MailerQ.RestApi
 {
@@ -25,12 +24,4 @@ public class PoolIP : IRestApiModel
         [JsonProperty(Required = Required.Always)]
         public string Name { get; set; }
     }
-
-    /// <inheritdoc />
-    [JsonObject(
-        NamingStrategyType = typeof(LowercaseNamingStrategy),
-        ItemNullValueHandling = NullValueHandling.Ignore
-    )]
-    [Obsolete("User PoolIP class")]
-    public class IpAddress : PoolIP { }
 }