merge heads

Author: michaelklishin

src/com/rabbitmq/client/impl/recovery/RecordedBinding.java

@@ -52,9 +52,8 @@ public void setDestination(String destination) {
         this.destination = destination;
     }
 
-    public Object recover() throws IOException {
+    public void recover() throws IOException {
         // Implemented by subclasses
-        return null;
     }
 
     @Override

src/com/rabbitmq/client/impl/recovery/RecordedExchange.java

@@ -1,7 +1,5 @@
 package com.rabbitmq.client.impl.recovery;
 
-import com.rabbitmq.client.AMQP;
-
 import java.io.IOException;
 import java.util.Map;
 
@@ -18,8 +16,8 @@ public RecordedExchange(AutorecoveringChannel channel, String name) {
         super(channel, name);
     }
 
-    public AMQP.Exchange.DeclareOk recover() throws IOException {
-        return this.channel.getDelegate().exchangeDeclare(this.name, this.type, this.durable, this.autoDelete, this.arguments);
+    public void recover() throws IOException {
+        this.channel.getDelegate().exchangeDeclare(this.name, this.type, this.durable, this.autoDelete, this.arguments);
     }
 
     public RecordedExchange durable(boolean value) {

src/com/rabbitmq/client/impl/recovery/RecordedExchangeBinding.java

@@ -1,7 +1,5 @@
 package com.rabbitmq.client.impl.recovery;
 
-import com.rabbitmq.client.AMQP;
-
 import java.io.IOException;
 
 /**
@@ -12,7 +10,7 @@ public RecordedExchangeBinding(AutorecoveringChannel channel) {
         super(channel);
     }
 
-    public AMQP.Exchange.BindOk recover() throws IOException {
-        return this.channel.getDelegate().exchangeBind(this.source, this.destination, this.routingKey, this.arguments);
+    public void recover() throws IOException {
+        this.channel.getDelegate().exchangeBind(this.source, this.destination, this.routingKey, this.arguments);
     }
 }

src/com/rabbitmq/client/impl/recovery/RecordedQueue.java

@@ -1,7 +1,5 @@
 package com.rabbitmq.client.impl.recovery;
 
-import com.rabbitmq.client.AMQP;
-
 import java.io.IOException;
 import java.util.Map;
 
@@ -34,11 +32,12 @@ public boolean isServerNamed() {
         return this.serverNamed;
     }
 
-    public AMQP.Queue.DeclareOk recover() throws IOException {
-        AMQP.Queue.DeclareOk ok = this.channel.queueDeclare(this.getNameToUseForRecovery(), this.durable, this.exclusive, this.autoDelete, this.arguments);
-        this.name = ok.getQueue();
-
-        return ok;
+    public void recover() throws IOException {
+        this.name = this.channel.queueDeclare(this.getNameToUseForRecovery(),
+                                                     this.durable,
+                                                     this.exclusive,
+                                                     this.autoDelete,
+                                                     this.arguments).getQueue();
     }
 
     public String getNameToUseForRecovery() {

src/com/rabbitmq/client/impl/recovery/RecordedQueueBinding.java

@@ -1,7 +1,5 @@
 package com.rabbitmq.client.impl.recovery;
 
-import com.rabbitmq.client.AMQP;
-
 import java.io.IOException;
 
 /**
@@ -12,7 +10,7 @@ public RecordedQueueBinding(AutorecoveringChannel channel) {
         super(channel);
     }
 
-    public AMQP.Queue.BindOk recover() throws IOException {
-        return this.channel.getDelegate().queueBind(this.getDestination(), this.getSource(), this.routingKey, this.arguments);
+    public void recover() throws IOException {
+        this.channel.getDelegate().queueBind(this.getDestination(), this.getSource(), this.routingKey, this.arguments);
     }
 }