Merged heads

Author: Emile Joubert

projects/client/Apigen/src/apigen/Apigen.cs

@@ -857,7 +857,7 @@ public void EmitContentHeaderFactory(MethodInfo method) {
 	    EmitLine("    {");
         if (Attribute(method, typeof(AmqpUnsupportedAttribute)) != null)
         {
-            EmitLine(String.Format("      return default({0});", method.ReturnType));
+            EmitLine(String.Format("      throw new UnsupportedMethodException(\"" + method.Name + "\");"));
         }
         else
         {
@@ -1134,35 +1134,26 @@ public void EmitAsynchronousHandlers(ArrayList asynchronousHandlers) {
                 string implClass = MangleMethodClass(amqpClass, amqpMethod);
 
                 EmitLine("        case "+((amqpClass.Index << 16) | amqpMethod.Index)+": {");
-                ParameterInfo[] parameters =  method.GetParameters();
+                ParameterInfo[] parameters = method.GetParameters();
                 if (parameters.Length > 0) {
-		            EmitLine("          "+implClass+" __impl = ("+implClass+") __method;");
+		    EmitLine("          "+implClass+" __impl = ("+implClass+") __method;");
                     EmitLine("          "+method.Name+"(");
                     int remaining = parameters.Length;
                     foreach (ParameterInfo pi in parameters) {
+                        if (Attribute(pi, typeof(AmqpContentHeaderMappingAttribute)) != null) {
+                            Emit("            ("+pi.ParameterType+") cmd.Header");
+                        } else if (Attribute(pi, typeof(AmqpContentBodyMappingAttribute)) != null) {
+                            Emit("            cmd.Body");
+                        } else {
+                            AmqpFieldMappingAttribute fieldMapping =
+                                Attribute(pi, typeof(AmqpFieldMappingAttribute)) as AmqpFieldMappingAttribute;
+                            Emit("            __impl.m_"+(fieldMapping == null
+                                                          ? pi.Name
+                                                          : fieldMapping.m_fieldName));
+                        }
                         remaining--;
-                        if (Attribute(pi, typeof(AmqpUnsupportedAttribute)) == null)
-                        {
-                            if (Attribute(pi, typeof(AmqpContentHeaderMappingAttribute)) != null)
-                            {
-                                Emit("            (" + pi.ParameterType + ") cmd.Header");
-                            }
-                            else if (Attribute(pi, typeof(AmqpContentBodyMappingAttribute)) != null)
-                            {
-                                Emit("            cmd.Body");
-                            }
-                            else
-                            {
-                                AmqpFieldMappingAttribute fieldMapping =
-                                    Attribute(pi, typeof(AmqpFieldMappingAttribute)) as AmqpFieldMappingAttribute;
-                                Emit("            __impl.m_" + (fieldMapping == null
-                                                              ? pi.Name
-                                                              : fieldMapping.m_fieldName));
-                            }
-                            if (remaining > 0)
-                            {
-                                EmitLine(",");
-                            }
+                        if (remaining > 0) {
+                            EmitLine(",");
                         }
                     }
                     EmitLine(");");

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

@@ -386,11 +386,11 @@ BasicGetResult BasicGet(string queue,
         void TxRollback();
 
         ///<summary>(Spec method) Enable DTX mode for this session.</summary>
-        [AmqpMethodDoNotImplement("RabbitMQ.Client.Framing.v0_9_1")]
+        [AmqpUnsupported("RabbitMQ.Client.Framing.v0_9_1")]
         void DtxSelect();
 
         ///<summary>(Spec method)</summary>
-        [AmqpMethodDoNotImplement("RabbitMQ.Client.Framing.v0_9_1")]
+        [AmqpUnsupported("RabbitMQ.Client.Framing.v0_9_1")]
         void DtxStart(string dtxIdentifier);
 
         ///<summary>Close this session.</summary>
@@ -701,7 +701,7 @@ void _Private_ConnectionOpen(string virtualHost,
                                      bool insist);
 
         ///<summary>Handle an incoming Connection.OpenOk.</summary>
-        void HandleConnectionOpenOk([AmqpUnsupported("RabbitMQ.Client.Framing.v0_9_1")]
+        void HandleConnectionOpenOk([AmqpFieldMapping("RabbitMQ.Client.Framing.v0_9_1", "reserved1")]
                                     string knownHosts);
 
         ///<summary>Handle an incoming Connection.Redirect.</summary>

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;
@@ -806,8 +806,8 @@ public abstract void BasicReject(ulong deliveryTag,
         public abstract void TxCommit();
         public abstract void TxRollback();
 
-        public virtual void DtxSelect() { }
-        public virtual void DtxStart(string dtxIdentifier) { }
+        public abstract void DtxSelect();
+        public abstract void DtxStart(string dtxIdentifier);
 
         void IDisposable.Dispose()
         {