Add synchronous flag, and unify default values with default branch / 0.8 spec

1 files changed, 62 insertions, 39 deletions

diff --git a/amqp-0.9.1.json b/amqp-0.9.1.json
index 7aeed10..ff870e2 100644
--- a/amqp-0.9.1.json
+++ b/amqp-0.9.1.json
@@ -102,11 +102,12 @@
 	    "id": 10,
 	    "methods": [{"id": 10,
                          "arguments": [{"type": "octet", "name": "version-major", "default-value": 0},
-				       {"type": "octet", "name": "version-minor", "default-value": 8},
+				       {"type": "octet", "name": "version-minor", "default-value": 9},
 				       {"domain": "peer-properties", "name": "server properties"},
 				       {"type": "longstr", "name": "mechanisms", "default-value": "PLAIN"},
 				       {"type": "longstr", "name": "locales", "default-value": "en_US"}],
-			 "name": "start"},
+			 "name": "start",
+			 "synchronous" : "true"},
 			{"id": 11,
 			 "arguments": [{"domain": "peer-properties", "name": "client-properties"},
 				       {"type": "shortstr", "name": "mechanism", "default-value": "PLAIN"},
@@ -115,7 +116,8 @@
 			 "name": "start-ok"},
 			{"id": 20,
 			 "arguments": [{"type": "longstr", "name": "challenge"}],
-			 "name": "secure"},
+			 "name": "secure",
+			 "synchronous" : "true"},
 			{"id": 21,
 			 "arguments": [{"type": "longstr", "name": "response"}],
 			 "name": "secure-ok"},
@@ -123,7 +125,8 @@
 			 "arguments": [{"type": "short", "name": "channel-max", "default-value": 0},
 				       {"type": "long", "name": "frame-max", "default-value": 0},
 				       {"type": "short", "name": "heartbeat", "default-value": 0}],
-			 "name": "tune"},
+			 "name": "tune",
+			 "synchronous" : "true"},
 			{"id": 31,
 			 "arguments": [{"type": "short", "name": "channel-max", "default-value": 0},
 				       {"type": "long", "name": "frame-max", "default-value": 0},
@@ -133,7 +136,8 @@
 			 "arguments": [{"type": "shortstr", "name": "virtual-host", "default-value": "/"},
 				       {"type": "shortstr", "name": "deprecated-capabilities", "default-value": ""},
 				       {"type": "bit", "name": "deprecated-insist", "default-value": false}],
-			 "name": "open"},
+			 "name": "open",
+			 "synchronous" : "true"},
 			{"id": 41,
 			 "arguments": [{"type": "shortstr", "name": "deprecated-known-hosts", "default-value": ""}],
 			 "name": "open-ok"},
@@ -142,7 +146,8 @@
 				       {"type": "shortstr", "name": "reply-text", "default-value": ""},
 				       {"type": "short", "name": "class-id"},
 				       {"type": "short", "name": "method-id"}],
-			 "name": "close"},
+			 "name": "close",
+			 "synchronous" : "true"},
 			{"id": 51,
 			 "arguments": [],
 			 "name": "close-ok"}],
@@ -153,13 +158,15 @@
 	    "id": 20,
 	    "methods": [{"id": 10,
 			 "arguments": [{"type": "shortstr", "name": "deprecated-out-of-band", "default-value": ""}],
-			 "name": "open"},
+			 "name": "open",
+			 "synchronous" : "true"},
 			{"id": 11,
 			 "arguments": [{"type": "longstr", "name": "deprecated-channel-id", "default-value": ""}],
 			 "name": "open-ok"},
 			{"id": 20,
 			 "arguments": [{"type": "bit", "name": "active"}],
-			 "name": "flow"},
+			 "name": "flow",
+			 "synchronous" : "true"},
 			{"id": 21,
 			 "arguments": [{"type": "bit", "name": "active"}],
 			 "name": "flow-ok"},
@@ -168,7 +175,8 @@
 				       {"type": "shortstr", "name": "reply-text", "default-value": ""},
 				       {"type": "short", "name": "class-id"},
 				       {"type": "short", "name": "method-id"}],
-			 "name": "close"},
+			 "name": "close",
+			 "synchronous" : "true"},
 			{"id": 41,
 			 "arguments": [],
 			 "name": "close-ok"}],
@@ -177,7 +185,7 @@
 	{
 	    "id": 40,
 	    "methods": [{"id": 10,
-			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 1},
+			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 0},
 				       {"type": "shortstr", "name": "exchange"},
 				       {"type": "shortstr", "name": "type", "default-value": "direct"},
 				       {"type": "bit", "name": "passive", "default-value": false},
@@ -186,16 +194,18 @@
 				       {"type": "bit", "name": "deprecated-internal", "default-value": false},
 				       {"type": "bit", "name": "nowait", "default-value": false},
 				       {"type": "table", "name": "arguments", "default-value": {}}],
-			 "name": "declare"},
+			 "name": "declare",
+			 "synchronous" : "true"},
 			{"id": 11,
 			 "arguments": [],
 			 "name": "declare-ok"},
 			{"id": 20,
-			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 1},
+			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 0},
 				       {"type": "shortstr", "name": "exchange"},
 				       {"type": "bit", "name": "if-unused", "default-value": false},
 				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "delete"},
+			 "name": "delete",
+			 "synchronous" : "true"},
 			{"id": 21,
 			 "arguments": [],
 			 "name": "delete-ok"}],
@@ -212,48 +222,53 @@
 				       {"type": "bit", "name": "auto-delete", "default-value": false},
 				       {"type": "bit", "name": "nowait", "default-value": false},
 				       {"type": "table", "name": "arguments", "default-value": {}}],
-			 "name": "declare"},
+			 "name": "declare",
+			 "synchronous" : "true"},
 			{"id": 11,
 			 "arguments": [{"type": "shortstr", "name": "queue"},
 				       {"type": "long", "name": "message-count"},
 				       {"type": "long", "name": "consumer-count"}],
 			 "name": "declare-ok"},
 			{"id": 20,
-			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 1},
+			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 0},
 				       {"type": "shortstr", "name": "queue"},
 				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key"},
+				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
 				       {"type": "bit", "name": "nowait", "default-value": false},
 				       {"type": "table", "name": "arguments", "default-value": {}}],
-			 "name": "bind"},
+			 "name": "bind",
+			 "synchronous" : "true"},
 			{"id": 21,
 			 "arguments": [],
 			 "name": "bind-ok"},
 			{"id": 30,
-			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 1},
+			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 0},
 				       {"type": "shortstr", "name": "queue"},
 				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "purge"},
+			 "name": "purge",
+			 "synchronous" : "true"},
 			{"id": 31,
 			 "arguments": [{"type": "long", "name": "message-count"}],
 			 "name": "purge-ok"},
 			{"id": 40,
-			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 1},
+			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 0},
 				       {"type": "shortstr", "name": "queue"},
 				       {"type": "bit", "name": "if-unused", "default-value": false},
 				       {"type": "bit", "name": "if-empty", "default-value": false},
 				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "delete"},
+			 "name": "delete",
+			 "synchronous" : "true"},
 			{"id": 41,
 			 "arguments": [{"type": "long", "name": "message-count"}],
 			 "name": "delete-ok"},
 			{"id": 50,
-			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 1},
+			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 0},
 				       {"type": "shortstr", "name": "queue"},
 				       {"type": "shortstr", "name": "exchange"},
-				       {"type": "shortstr", "name": "routing-key"},
-				       {"type": "table", "name": "arguments"}],
-			 "name": "unbind"},
+				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
+				       {"type": "table", "name": "arguments", "default-value": {}}],
+			 "name": "unbind",
+			 "synchronous" : "true"},
 			{"id": 51,
 			 "arguments": [],
 			 "name": "unbind-ok"}
@@ -266,35 +281,38 @@
 			 "arguments": [{"type": "long", "name": "prefetch-size", "default-value": 0},
 				       {"type": "short", "name": "prefetch-count", "default-value": 0},
 				       {"type": "bit", "name": "global", "default-value": false}],
-			 "name": "qos"},
+			 "name": "qos",
+			 "synchronous" : "true"},
 			{"id": 11,
 			 "arguments": [],
 			 "name": "qos-ok"},
 			{"id": 20,
-			 "arguments": [{"domain": "short", "name": "deprecated-ticket", "default-value": 1},
+			 "arguments": [{"domain": "short", "name": "deprecated-ticket", "default-value": 0},
 				       {"domain": "queue-name", "name": "queue"},
-				       {"type": "shortstr", "name": "consumer-tag"},
+				       {"type": "shortstr", "name": "consumer-tag", "default-value": ""},
 				       {"type": "bit", "name": "no-local", "default-value": false},
 				       {"type": "bit", "name": "no-ack", "default-value": false},
 				       {"type": "bit", "name": "exclusive", "default-value": false},
 				       {"type": "bit", "name": "nowait", "default-value": false},
 				       {"type": "table", "name": "filter", "default-value": {}}],
-			 "name": "consume"},
+			 "name": "consume",
+			 "synchronous" : "true"},
 			{"id": 21,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
 			 "name": "consume-ok"},
 			{"id": 30,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"},
 				       {"type": "bit", "name": "nowait", "default-value": false}],
-			 "name": "cancel"},
+			 "name": "cancel",
+			 "synchronous" : "true"},
 			{"id": 31,
 			 "arguments": [{"type": "shortstr", "name": "consumer-tag"}],
 			 "name": "cancel-ok"},
 			{"content": true,
 			 "id": 40,
-			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 1},
+			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 0},
 				       {"type": "shortstr", "name": "exchange", "default-value": ""},
-				       {"type": "shortstr", "name": "routing-key"},
+				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
 				       {"type": "bit", "name": "mandatory", "default-value": false},
 				       {"type": "bit", "name": "immediate", "default-value": false}],
 			 "name": "publish"},
@@ -314,10 +332,11 @@
 				       {"type": "shortstr", "name": "routing-key"}],
 			 "name": "deliver"},
 			{"id": 70,
-			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 1},
+			 "arguments": [{"type": "short", "name": "deprecated-ticket", "default-value": 0},
 				       {"type": "shortstr", "name": "queue"},
 				       {"type": "bit", "name": "no-ack", "default-value": false}],
-			 "name": "get"},
+			 "name": "get",
+			 "synchronous" : "true"},
 			{"content": true,
 			 "id": 71,
 			 "arguments": [{"type": "longlong", "name": "delivery-tag"},
@@ -331,7 +350,7 @@
 			 "name": "get-empty"},
 			{"id": 80,
 			 "arguments": [{"type": "longlong", "name": "delivery-tag", "default-value": 0},
-				       {"type": "bit", "name": "multiple", "default-value": true}],
+				       {"type": "bit", "name": "multiple", "default-value": false}],
 			 "name": "ack"},
 			{"id": 90,
 			 "arguments": [{"type": "longlong", "name": "delivery-tag"},
@@ -342,7 +361,8 @@
 			 "name": "recover-async"},
 			{"id": 110,
 			 "arguments": [{"type": "bit", "name": "requeue", "default-value": false}],
-			 "name": "recover"},
+			 "name": "recover",
+			 "synchronous" : "true"},
 			{"id": 111,
 			 "arguments": [],
 			 "name": "recover-ok"}],
@@ -366,19 +386,22 @@
 	    "id": 90,
 	    "methods": [{"id": 10,
 			 "arguments": [],
-			 "name": "select"},
+			 "name": "select",
+			 "synchronous" : "true"},
 			{"id": 11,
 			 "arguments": [],
 			 "name": "select-ok"},
 			{"id": 20,
 			 "arguments": [],
-			 "name": "commit"},
+			 "name": "commit",
+			 "synchronous" : "true"},
 			{"id": 21,
 			 "arguments": [],
 			 "name": "commit-ok"},
 			{"id": 30,
 			 "arguments": [],
-			 "name": "rollback"},
+			 "name": "rollback",
+			 "synchronous" : "true"},
 			{"id": 31,
 			 "arguments": [],
 			 "name": "rollback-ok"}],