Basic.recover and async recover

Amend the specification to agree with the description
This makes basic.recover synchronous for all protocols

Author: Emile Joubert

docs/specs/amqp0-8.stripped.xml

@@ -456,10 +456,18 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="delivery tag" domain="delivery tag"/>
       <field name="requeue" type="bit"/>
     </method>
-    <method name="recover" index="100">
+    <method name="recover-async" index="100">
       <chassis name="server" implement="MUST"/>
       <field name="requeue" type="bit"/>
     </method>
+    <method name="recover" synchronous="1" index="110">
+      <response name="recover-ok"/>
+      <chassis name="server" implement="MAY"/>
+      <field name="requeue" domain="bit"/>
+    </method>
+    <method name="recover-ok" index="111">
+      <chassis name="client" implement="MAY"/>
+    </method>
   </class>
   <class name="file" handler="channel" index="70">
     <chassis name="server" implement="MAY"/>

docs/specs/amqp0-9-1.stripped.xml

@@ -423,7 +423,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <chassis name="server" implement="MAY"/>
       <field name="requeue" domain="bit"/>
     </method>
-    <method name="recover" index="110">
+    <method name="recover" synchronous="1" index="110">
+      <response name="recover-ok"/>
       <chassis name="server" implement="MUST"/>
       <field name="requeue" domain="bit"/>
     </method>

docs/specs/amqp0-9.stripped.xml

@@ -486,10 +486,18 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="delivery-tag" domain="delivery-tag"/>
       <field name="requeue" domain="bit"/>
     </method>
-    <method name="recover" index="100">
+    <method name="recover-async" index="100">
       <chassis name="server" implement="MUST"/>
       <field name="requeue" domain="bit"/>
     </method>
+    <method name="recover" synchronous="1" index="110">
+      <response name="recover-ok"/>
+      <chassis name="server" implement="MAY"/>
+      <field name="requeue" domain="bit"/>
+    </method>
+    <method name="recover-ok" index="111">
+      <chassis name="client" implement="MAY"/>
+    </method>
   </class>
   <class name="file" handler="channel" index="70">
     <chassis name="server" implement="MAY"/>

docs/specs/qpid-amqp.0-8.stripped.xml

@@ -454,7 +454,13 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="delivery tag" domain="delivery tag"/>
       <field name="requeue" type="bit"/>
     </method>
-    <method name="recover" index="100">
+    <method name="recover-async" index="100">
+      <chassis name="server" implement="MUST"/>
+      <field name="requeue" type="bit"/>
+      <response name="recover-ok"/>
+    </method>
+    <method name="recover" index="110">
+      <response name="recover-ok"/>
       <chassis name="server" implement="MUST"/>
       <field name="requeue" type="bit"/>
       <response name="recover-ok"/>

projects/client/RabbitMQ.Client/src/client/api/IModel.cs

@@ -366,6 +366,9 @@ void BasicReject(ulong deliveryTag,
         ///<summary>(Spec method)</summary>
         void BasicRecover(bool requeue);
 
+        ///<summary>(Spec method)</summary>
+        void BasicRecoverAsync(bool requeue);
+
         ///<summary>(Spec method) Retrieve an individual message, if
         ///one is available; returns null if the server answers that
         ///no messages are currently available. See also

projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs

@@ -146,8 +146,8 @@ public event CallbackExceptionEventHandler CallbackException
                     m_callbackException -= value;
                 }
             }
-        }
-
+        }
+
         public IBasicConsumer DefaultConsumer { get; set; }
 
         public ISession m_session;
@@ -801,6 +801,7 @@ public abstract void BasicReject(ulong deliveryTag,
                                          bool requeue);
 
         public abstract void BasicRecover(bool requeue);
+        public abstract void BasicRecoverAsync(bool requeue);
 
         public abstract void TxSelect();
         public abstract void TxCommit();