From eb017e7b63dd4b558fcaa694569d004085ccb19a Mon Sep 17 00:00:00 2001
From: Mark van Renswoude <mark@x2software.net>
Date: Sun, 12 Feb 2017 19:15:56 +0100
Subject: [PATCH] Renamed StaticQueue attribute to DurableQueue to match
 RabbitMQ terminology (breaking change) Changed default delivery mode to
 persistent

---
 .../{StaticQueueAttribute.cs => DurableQueueAttribute.cs} | 4 ++--
 Tapeti.Annotations/Tapeti.Annotations.csproj              | 2 +-
 Tapeti/Connection/TapetiWorker.cs                         | 5 ++++-
 Tapeti/TapetiConfig.cs                                    | 8 ++++----
 4 files changed, 11 insertions(+), 8 deletions(-)
 rename Tapeti.Annotations/{StaticQueueAttribute.cs => DurableQueueAttribute.cs} (87%)

diff --git a/Tapeti.Annotations/StaticQueueAttribute.cs b/Tapeti.Annotations/DurableQueueAttribute.cs
similarity index 87%
rename from Tapeti.Annotations/StaticQueueAttribute.cs
rename to Tapeti.Annotations/DurableQueueAttribute.cs
index 2a9c6b1..bf4cac7 100644
--- a/Tapeti.Annotations/StaticQueueAttribute.cs
+++ b/Tapeti.Annotations/DurableQueueAttribute.cs
@@ -12,12 +12,12 @@ namespace Tapeti.Annotations
     /// for deploy-time management of durable queues (shameless plug intended).
     /// </remarks>
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
-    public class StaticQueueAttribute : Attribute
+    public class DurableQueueAttribute : Attribute
     {
         public string Name { get; set; }
 
 
-        public StaticQueueAttribute(string name)
+        public DurableQueueAttribute(string name)
         {
             Name = name;
         }
diff --git a/Tapeti.Annotations/Tapeti.Annotations.csproj b/Tapeti.Annotations/Tapeti.Annotations.csproj
index 55b874f..4413722 100644
--- a/Tapeti.Annotations/Tapeti.Annotations.csproj
+++ b/Tapeti.Annotations/Tapeti.Annotations.csproj
@@ -46,7 +46,7 @@
     <Compile Include="MessageControllerAttribute.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RequestAttribute.cs" />
-    <Compile Include="StaticQueueAttribute.cs" />
+    <Compile Include="DurableQueueAttribute.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Tapeti/Connection/TapetiWorker.cs b/Tapeti/Connection/TapetiWorker.cs
index c7affe9..9763332 100644
--- a/Tapeti/Connection/TapetiWorker.cs
+++ b/Tapeti/Connection/TapetiWorker.cs
@@ -137,9 +137,12 @@ namespace Tapeti.Connection
             return taskQueue.Value.Add(async () =>
             {
                 var messageProperties = properties ?? new BasicProperties();
-                if (messageProperties.Timestamp.UnixTime == 0)
+                if (!messageProperties.IsTimestampPresent())
                     messageProperties.Timestamp = new AmqpTimestamp(new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds());
 
+                if (!messageProperties.IsDeliveryModePresent())
+                    messageProperties.DeliveryMode = 2; // Persistent
+
                 var body = messageSerializer.Serialize(message, messageProperties);
 
                 (await GetChannel())
diff --git a/Tapeti/TapetiConfig.cs b/Tapeti/TapetiConfig.cs
index b90299e..f0c3687 100644
--- a/Tapeti/TapetiConfig.cs
+++ b/Tapeti/TapetiConfig.cs
@@ -291,16 +291,16 @@ namespace Tapeti
         protected QueueInfo GetQueueInfo(MemberInfo member)
         {
             var dynamicQueueAttribute = member.GetCustomAttribute<DynamicQueueAttribute>();
-            var staticQueueAttribute = member.GetCustomAttribute<StaticQueueAttribute>();
+            var durableQueueAttribute = member.GetCustomAttribute<DurableQueueAttribute>();
 
-            if (dynamicQueueAttribute != null && staticQueueAttribute != null)
+            if (dynamicQueueAttribute != null && durableQueueAttribute != null)
                 throw new TopologyConfigurationException($"Cannot combine static and dynamic queue attributes on {member.Name}");
 
             if (dynamicQueueAttribute != null)
                 return new QueueInfo { Dynamic = true };
 
-            if (staticQueueAttribute != null)
-                return new QueueInfo { Dynamic = false, Name = staticQueueAttribute.Name };
+            if (durableQueueAttribute != null)
+                return new QueueInfo { Dynamic = false, Name = durableQueueAttribute.Name };
 
             return null;
         }