Skip to content

Commit 5cc3147

Browse files
michaelklishinmichaelklishin
committed
Nowait => NoWait
1 parent da33f93 commit 5cc3147

File tree

5 files changed

+35
-35
lines changed

5 files changed

+35
-35
lines changed

‎src/com/rabbitmq/client/Channel.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ Exchange.DeclareOk exchangeDeclare(String exchange,
358358
* @return a declaration-confirm method to indicate the exchange was successfully declared
359359
* @throws java.io.IOException if an error is encountered
360360
*/
361-
void exchangeDeclareNowait(String exchange,
361+
void exchangeDeclareNoWait(String exchange,
362362
String type,
363363
boolean durable,
364364
boolean autoDelete,
@@ -392,7 +392,7 @@ void exchangeDeclareNowait(String exchange,
392392
* @param ifUnused true to indicate that the exchange is only to be deleted if it is unused
393393
* @throws java.io.IOException if an error is encountered
394394
*/
395-
void exchangeDeleteNowait(String exchange, boolean ifUnused) throws IOException;
395+
void exchangeDeleteNoWait(String exchange, boolean ifUnused) throws IOException;
396396

397397

398398
/**
@@ -439,7 +439,7 @@ void exchangeDeclareNowait(String exchange,
439439
* @param arguments other properties (binding parameters)
440440
* @throws java.io.IOException if an error is encountered
441441
*/
442-
void exchangeBindNowait(String destination, String source, String routingKey, Map<String, Object> arguments) throws IOException;
442+
void exchangeBindNoWait(String destination, String source, String routingKey, Map<String, Object> arguments) throws IOException;
443443

444444
/**
445445
* Unbind an exchange from an exchange, with no extra arguments.
@@ -501,7 +501,7 @@ Queue.DeclareOk queueDeclare(String queue, boolean durable, boolean exclusive, b
501501
* @param arguments other properties (construction arguments) for the queue
502502
* @throws java.io.IOException if an error is encountered
503503
*/
504-
void queueDeclareNowait(String queue, boolean durable, boolean exclusive, boolean autoDelete,
504+
void queueDeclareNoWait(String queue, boolean durable, boolean exclusive, boolean autoDelete,
505505
Map<String, Object> arguments) throws IOException;
506506

507507
/**
@@ -550,7 +550,7 @@ void queueDeclareNowait(String queue, boolean durable, boolean exclusive, boolea
550550
* @param ifEmpty true if the queue should be deleted only if empty
551551
* @throws java.io.IOException if an error is encountered
552552
*/
553-
void queueDeleteNowait(String queue, boolean ifUnused, boolean ifEmpty) throws IOException;
553+
void queueDeleteNoWait(String queue, boolean ifUnused, boolean ifEmpty) throws IOException;
554554

555555
/**
556556
* Bind a queue to an exchange, with no extra arguments.
@@ -587,7 +587,7 @@ void queueDeclareNowait(String queue, boolean durable, boolean exclusive, boolea
587587
* @param arguments other properties (binding parameters)
588588
* @throws java.io.IOException if an error is encountered
589589
*/
590-
void queueBindNowait(String queue, String exchange, String routingKey, Map<String, Object> arguments) throws IOException;
590+
void queueBindNoWait(String queue, String exchange, String routingKey, Map<String, Object> arguments) throws IOException;
591591

592592
/**
593593
* Unbinds a queue from an exchange, with no extra arguments.

‎src/com/rabbitmq/client/impl/ChannelN.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ public Exchange.DeclareOk exchangeDeclare(String exchange, String type,
664664
arguments);
665665
}
666666

667-
public void exchangeDeclareNowait(String exchange,
667+
public void exchangeDeclareNoWait(String exchange,
668668
String type,
669669
boolean durable,
670670
boolean autoDelete,
@@ -743,7 +743,7 @@ public Exchange.DeleteOk exchangeDelete(String exchange, boolean ifUnused)
743743
}
744744

745745
/** Public API - {@inheritDoc} */
746-
public void exchangeDeleteNowait(String exchange, boolean ifUnused) throws IOException {
746+
public void exchangeDeleteNoWait(String exchange, boolean ifUnused) throws IOException {
747747
transmit(new AMQCommand(new Exchange.Delete.Builder()
748748
.exchange(exchange)
749749
.ifUnused(ifUnused)
@@ -773,7 +773,7 @@ public Exchange.BindOk exchangeBind(String destination, String source,
773773
}
774774

775775
/** Public API - {@inheritDoc} */
776-
public void exchangeBindNowait(String destination,
776+
public void exchangeBindNoWait(String destination,
777777
String source,
778778
String routingKey,
779779
Map<String, Object> arguments) throws IOException {
@@ -836,7 +836,7 @@ public com.rabbitmq.client.AMQP.Queue.DeclareOk queueDeclare()
836836
}
837837

838838
/** Public API - {@inheritDoc} */
839-
public void queueDeclareNowait(String queue,
839+
public void queueDeclareNoWait(String queue,
840840
boolean durable,
841841
boolean exclusive,
842842
boolean autoDelete,
@@ -880,7 +880,7 @@ public Queue.DeleteOk queueDelete(String queue, boolean ifUnused, boolean ifEmpt
880880
}
881881

882882
@Override
883-
public void queueDeleteNowait(String queue, boolean ifUnused, boolean ifEmpty) throws IOException {
883+
public void queueDeleteNoWait(String queue, boolean ifUnused, boolean ifEmpty) throws IOException {
884884
transmit(new AMQCommand(new Queue.Delete.Builder()
885885
.queue(queue)
886886
.ifUnused(ifUnused)
@@ -920,7 +920,7 @@ public Queue.BindOk queueBind(String queue, String exchange, String routingKey)
920920
}
921921

922922
/** Public API - {@inheritDoc} */
923-
public void queueBindNowait(String queue,
923+
public void queueBindNoWait(String queue,
924924
String exchange,
925925
String routingKey,
926926
Map<String, Object> arguments) throws IOException {

‎src/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -191,14 +191,14 @@ public AMQP.Exchange.DeclareOk exchangeDeclare(String exchange, String type, boo
191191
}
192192

193193
@Override
194-
public void exchangeDeclareNowait(String exchange, String type, boolean durable, boolean autoDelete, boolean internal, Map<String, Object> arguments) throws IOException {
194+
public void exchangeDeclareNoWait(String exchange, String type, boolean durable, boolean autoDelete, boolean internal, Map<String, Object> arguments) throws IOException {
195195
RecordedExchange x = new RecordedExchange(this, exchange).
196196
type(type).
197197
durable(durable).
198198
autoDelete(autoDelete).
199199
arguments(arguments);
200200
recordExchange(exchange, x);
201-
delegate.exchangeDeclareNowait(exchange, type, durable, autoDelete, internal, arguments);
201+
delegate.exchangeDeclareNoWait(exchange, type, durable, autoDelete, internal, arguments);
202202
}
203203

204204
public AMQP.Exchange.DeclareOk exchangeDeclarePassive(String name) throws IOException {
@@ -210,9 +210,9 @@ public AMQP.Exchange.DeleteOk exchangeDelete(String exchange, boolean ifUnused)
210210
return delegate.exchangeDelete(exchange, ifUnused);
211211
}
212212

213-
public void exchangeDeleteNowait(String exchange, boolean ifUnused) throws IOException {
213+
public void exchangeDeleteNoWait(String exchange, boolean ifUnused) throws IOException {
214214
deleteRecordedExchange(exchange);
215-
delegate.exchangeDeleteNowait(exchange, ifUnused);
215+
delegate.exchangeDeleteNoWait(exchange, ifUnused);
216216
}
217217

218218
public AMQP.Exchange.DeleteOk exchangeDelete(String exchange) throws IOException {
@@ -229,8 +229,8 @@ public AMQP.Exchange.BindOk exchangeBind(String destination, String source, Stri
229229
return ok;
230230
}
231231

232-
public void exchangeBindNowait(String destination, String source, String routingKey, Map<String, Object> arguments) throws IOException {
233-
delegate.exchangeBindNowait(destination, source, routingKey, arguments);
232+
public void exchangeBindNoWait(String destination, String source, String routingKey, Map<String, Object> arguments) throws IOException {
233+
delegate.exchangeBindNoWait(destination, source, routingKey, arguments);
234234
recordExchangeBinding(destination, source, routingKey, arguments);
235235
}
236236

@@ -261,7 +261,7 @@ public AMQP.Queue.DeclareOk queueDeclare(String queue, boolean durable, boolean
261261
return ok;
262262
}
263263

264-
public void queueDeclareNowait(String queue,
264+
public void queueDeclareNoWait(String queue,
265265
boolean durable,
266266
boolean exclusive,
267267
boolean autoDelete,
@@ -271,7 +271,7 @@ public void queueDeclareNowait(String queue,
271271
exclusive(exclusive).
272272
autoDelete(autoDelete).
273273
arguments(arguments);
274-
delegate.queueDeclareNowait(queue, durable, exclusive, autoDelete, arguments);
274+
delegate.queueDeclareNoWait(queue, durable, exclusive, autoDelete, arguments);
275275
recordQueue(queue, meta);
276276

277277
}
@@ -290,9 +290,9 @@ public AMQP.Queue.DeleteOk queueDelete(String queue, boolean ifUnused, boolean i
290290
}
291291

292292
@Override
293-
public void queueDeleteNowait(String queue, boolean ifUnused, boolean ifEmpty) throws IOException {
293+
public void queueDeleteNoWait(String queue, boolean ifUnused, boolean ifEmpty) throws IOException {
294294
deleteRecordedQueue(queue);
295-
delegate.queueDeleteNowait(queue, ifUnused, ifEmpty);
295+
delegate.queueDeleteNoWait(queue, ifUnused, ifEmpty);
296296
}
297297

298298
public AMQP.Queue.BindOk queueBind(String queue, String exchange, String routingKey) throws IOException {
@@ -305,8 +305,8 @@ public AMQP.Queue.BindOk queueBind(String queue, String exchange, String routing
305305
return ok;
306306
}
307307

308-
public void queueBindNowait(String queue, String exchange, String routingKey, Map<String, Object> arguments) throws IOException {
309-
delegate.queueBindNowait(queue, exchange, routingKey, arguments);
308+
public void queueBindNoWait(String queue, String exchange, String routingKey, Map<String, Object> arguments) throws IOException {
309+
delegate.queueBindNoWait(queue, exchange, routingKey, arguments);
310310
recordQueueBinding(queue, exchange, routingKey, arguments);
311311
}
312312

‎test/src/com/rabbitmq/client/test/functional/ConnectionRecovery.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ private AMQP.Exchange.DeclareOk declareExchange(Channel ch, String x) throws IOE
382382
}
383383

384384
private void declareExchangeNoWait(Channel ch, String x) throws IOException {
385-
ch.exchangeDeclareNowait(x, "fanout", false, false, false, null);
385+
ch.exchangeDeclareNoWait(x, "fanout", false, false, false, null);
386386
}
387387

388388
private void expectQueueRecovery(Channel ch, String q) throws IOException, InterruptedException, TimeoutException {

‎test/src/com/rabbitmq/client/test/functional/Nowait.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@
77
public class Nowait extends BrokerTestCase {
88
public void testQueueDeclareWithNowait() throws IOException {
99
String q = generateQueueName();
10-
channel.queueDeclareNowait(q, false, true, true, null);
10+
channel.queueDeclareNoWait(q, false, true, true, null);
1111
channel.queueDeclarePassive(q);
1212
}
1313

1414
public void testQueueBindWithNowait() throws IOException {
1515
String q = generateQueueName();
16-
channel.queueDeclareNowait(q, false, true, true, null);
17-
channel.queueBindNowait(q, "amq.fanout", "", null);
16+
channel.queueDeclareNoWait(q, false, true, true, null);
17+
channel.queueBindNoWait(q, "amq.fanout", "", null);
1818
}
1919

2020
public void testExchangeDeclareWithNowait() throws IOException {
2121
String x = generateExchangeName();
2222
try {
23-
channel.exchangeDeclareNowait(x, "fanout", false, false, false, null);
23+
channel.exchangeDeclareNoWait(x, "fanout", false, false, false, null);
2424
channel.exchangeDeclarePassive(x);
2525
} finally {
2626
channel.exchangeDelete(x);
@@ -30,22 +30,22 @@ public void testExchangeDeclareWithNowait() throws IOException {
3030
public void testExchangeBindWithNowait() throws IOException {
3131
String x = generateExchangeName();
3232
try {
33-
channel.exchangeDeclareNowait(x, "fanout", false, false, false, null);
34-
channel.exchangeBindNowait(x, "amq.fanout", "", null);
33+
channel.exchangeDeclareNoWait(x, "fanout", false, false, false, null);
34+
channel.exchangeBindNoWait(x, "amq.fanout", "", null);
3535
} finally {
3636
channel.exchangeDelete(x);
3737
}
3838
}
3939

4040
public void testQueueDeleteWithNowait() throws IOException {
4141
String q = generateQueueName();
42-
channel.queueDeclareNowait(q, false, true, true, null);
43-
channel.queueDeleteNowait(q, false, false);
42+
channel.queueDeclareNoWait(q, false, true, true, null);
43+
channel.queueDeleteNoWait(q, false, false);
4444
}
4545

4646
public void testExchangeDeleteWithNowait() throws IOException {
4747
String x = generateExchangeName();
48-
channel.exchangeDeclareNowait(x, "fanout", false, false, false, null);
49-
channel.exchangeDeleteNowait(x, false);
48+
channel.exchangeDeclareNoWait(x, "fanout", false, false, false, null);
49+
channel.exchangeDeleteNoWait(x, false);
5050
}
5151
}

0 commit comments

Comments
 (0)