Skip to content

Commit 42cf1be

Browse files
author
Matthias Radestock
committed
cosmetic: tabs->spaces, removal of trailing spaces
1 parent 0f70efe commit 42cf1be

28 files changed

+206
-206
lines changed

src/com/rabbitmq/client/AlreadyClosedException.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* which was already closed
66
*/
77
public class AlreadyClosedException extends ShutdownSignalException {
8-
public AlreadyClosedException(String s, Object ref)
9-
{
10-
super(true, true, s, ref);
11-
}
8+
public AlreadyClosedException(String s, Object ref)
9+
{
10+
super(true, true, s, ref);
11+
}
1212
}

src/com/rabbitmq/client/Channel.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
/**
3636
* Public API: Interface to an AMQ channel. See the <a href="http://www.amqp.org/">spec</a> for details.
37-
*
37+
*
3838
* <p>
3939
* To open a channel,
4040
* <pre>
@@ -49,11 +49,11 @@
4949
* <li> close
5050
* </ul>
5151
* <p>
52-
*
53-
* While a Channel can be used by multiple threads, it's important to ensure
52+
*
53+
* While a Channel can be used by multiple threads, it's important to ensure
5454
* that only one thread executes a command at once. Concurrent execution of
5555
* commands will likely cause an UnexpectedFrameError to be thrown.
56-
*
56+
*
5757
*/
5858

5959
public interface Channel extends ShutdownNotifier{
@@ -77,22 +77,22 @@ public interface Channel extends ShutdownNotifier{
7777
*/
7878
void close(int closeCode, String closeMessage) throws IOException;
7979

80-
/**
80+
/**
8181
* Return the current {@link ReturnListener}.
82-
* @return an interface to the current return listener
82+
* @return an interface to the current return listener
8383
*/
8484
ReturnListener getReturnListener();
8585

8686
/**
87-
* Set the current {@link ReturnListener}.
87+
* Set the current {@link ReturnListener}.
8888
* @param listener the listener to use, or null indicating "don't use one".
8989
*/
9090
void setReturnListener(ReturnListener listener);
9191

9292
/**
9393
* Request a non-exclusive access ticket for the specified realm.
9494
* The access ticket is valid within the current channel and for the lifespan of the channel.
95-
*
95+
*
9696
* @see com.rabbitmq.client.AMQP.Access.Request
9797
* @param realm the name of the realm
9898
* @return a valid access ticket
@@ -330,7 +330,7 @@ Queue.DeclareOk queueDeclare(int ticket, String queue, boolean passive, boolean
330330
* containing the received message being acknowledged.
331331
* @see com.rabbitmq.client.AMQP.Basic.Ack
332332
* @param deliveryTag the tag from the received {@link com.rabbitmq.client.AMQP.Basic.GetOk} or {@link com.rabbitmq.client.AMQP.Basic.Deliver}
333-
* @param multiple true if we are acknowledging multiple messages with the same delivery tag
333+
* @param multiple true if we are acknowledging multiple messages with the same delivery tag
334334
* @throws java.io.IOException if an error is encountered
335335
*/
336336
void basicAck(long deliveryTag, boolean multiple) throws IOException;

src/com/rabbitmq/client/Connection.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* Public API: Interface to an AMQ connection. See the see the <a href="http://www.amqp.org/">spec</a> for details.
3131
* <p>
3232
* To connect to a broker, fill in a {@link ConnectionParameters} and use a {@link ConnectionFactory} as follows:
33-
*
33+
*
3434
* <pre>
3535
* ConnectionParameters params = new ConnectionParameters();
3636
* params.setUsername(userName);
@@ -41,7 +41,7 @@
4141
* Connection conn = factory.newConnection(hostName, AMQP.PROTOCOL.PORT);
4242
*
4343
* // Then open a channel and retrieve an access ticket:
44-
*
44+
*
4545
* Channel channel = conn.createChannel();
4646
* int ticket = channel.accessRequest(realmName);
4747
* </pre>
@@ -104,7 +104,7 @@ public interface Connection extends ShutdownNotifier { // rename to AMQPConnecti
104104
* @return an array of addresses for all hosts that came back in the initial {@link com.rabbitmq.client.AMQP.Connection.OpenOk} open-ok method
105105
*/
106106
Address[] getKnownHosts();
107-
107+
108108
/**
109109
* Create a new channel, using an internally allocated channel number.
110110
* @return a new channel descriptor, or null if none is available
@@ -119,20 +119,20 @@ public interface Connection extends ShutdownNotifier { // rename to AMQPConnecti
119119
* @throws IOException if an I/O problem is encountered
120120
*/
121121
Channel createChannel(int channelNumber) throws IOException;
122-
122+
123123
/**
124124
* Close this connection and all its channels.
125-
*
125+
*
126126
* This method will wait infinitely for all the close operations to
127127
* complete.
128-
*
128+
*
129129
* @throws IOException if an I/O problem is encountered
130130
*/
131131
void close() throws IOException;
132-
132+
133133
/**
134134
* Close this connection and all its channels
135-
*
135+
*
136136
* This method will wait with the given timeout for all the close
137137
* operations to complete. If timeout is reached then socket is forced
138138
* to close
@@ -141,22 +141,22 @@ public interface Connection extends ShutdownNotifier { // rename to AMQPConnecti
141141
* @throws IOException if an I/O problem is encountered
142142
*/
143143
void close(int timeout) throws IOException;
144-
144+
145145
/**
146146
* Abort this connection and all its channels.
147-
*
147+
*
148148
* This method will force the connection to close. It will silently discard
149149
* any exceptions enountered in close operations
150150
*/
151151
void abort();
152-
152+
153153
/**
154154
* Abort this connection and all its channels.
155-
*
155+
*
156156
* This method behaves in a similar way as abort(), with the only difference
157157
* that it will wait with a provided timeout for all the close operations to
158158
* complete. If timeout is reached socket is forced to close.
159-
*
159+
*
160160
* @param timeout timeout (in miliseconds) for completing all the close-related
161161
* operations, use -1 for infinity
162162
*/

src/com/rabbitmq/client/ConnectionParameters.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ private static String safeGetProperty(String key, String def) {
5959
/** Default value for desired heartbeat interval; zero for none */
6060
public static final int DEFAULT_HEARTBEAT = 3;
6161

62-
/**
62+
/**
6363
* Default value for suppressAccessRequest flag. Retrieved from
6464
* system property
6565
* "com.rabbitmq.client.ConnectionParameters.suppressAccessRequest"
@@ -112,7 +112,7 @@ public String getPassword() {
112112
public void setPassword(String password) {
113113
_password = password;
114114
}
115-
115+
116116
/**
117117
* Retrieve the virtual host.
118118
* @return the virtual host to use when connecting to the broker
@@ -188,7 +188,7 @@ public boolean getSuppressAccessRequest() {
188188

189189
/**
190190
* Enable or disable the suppression of sending "access.request"
191-
* methods.
191+
* methods.
192192
* @param suppressAccessRequest true of "access.request" methods are suppressed, false otherwise.
193193
*/
194194
public void setSuppressAccessRequest(boolean suppressAccessRequest) {

src/com/rabbitmq/client/ContentHeader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*/
3131

3232
public interface ContentHeader {
33-
/**
33+
/**
3434
* Retrieve the class ID (see the spec for a list of allowable IDs).
3535
* @return class ID of this ContentHeader. Properly an unsigned short, i.e. only the lowest 16 bits are significant
3636
*/

src/com/rabbitmq/client/GetResponse.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
/**
3030
* Encapsulates the response from a {@link Channel#basicGet} message-retrieval method call
31-
* - essentially a static bean "holder" with message response data.
31+
* - essentially a static bean "holder" with message response data.
3232
*/
3333
public class GetResponse {
3434
private final Envelope envelope;
@@ -44,11 +44,11 @@ public class GetResponse {
4444
* @param messageCount the number of messages in the response
4545
*/
4646
public GetResponse(Envelope envelope, BasicProperties props, byte[] body, int messageCount)
47-
{
48-
this.envelope = envelope;
49-
this.props = props;
50-
this.body = body;
51-
this.messageCount = messageCount;
47+
{
48+
this.envelope = envelope;
49+
this.props = props;
50+
this.body = body;
51+
this.messageCount = messageCount;
5252
}
5353

5454
/**

src/com/rabbitmq/client/Method.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public interface Method {
4343
int protocolMethodId(); /* properly an unsigned short */
4444

4545
/**
46-
* Retrieve the method name
46+
* Retrieve the method name
4747
* @return the AMQP protocol method name of this Method
4848
*/
4949
String protocolMethodName();

src/com/rabbitmq/client/ReturnListener.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
* @see Channel#basicPublish
3535
*/
3636
public interface ReturnListener {
37-
void handleBasicReturn(int replyCode,
38-
String replyText,
39-
String exchange,
40-
String routingKey,
41-
AMQP.BasicProperties properties,
42-
byte[] body)
43-
throws IOException;
37+
void handleBasicReturn(int replyCode,
38+
String replyText,
39+
String exchange,
40+
String routingKey,
41+
AMQP.BasicProperties properties,
42+
byte[] body)
43+
throws IOException;
4444
}

src/com/rabbitmq/client/ShutdownListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.EventListener;
44

55
public interface ShutdownListener extends EventListener {
6-
7-
public void shutdownCompleted(ShutdownSignalException cause);
6+
7+
public void shutdownCompleted(ShutdownSignalException cause);
88

99
}

src/com/rabbitmq/client/ShutdownNotifier.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,46 @@
33
/**
44
* Interface for components that are shutdown capable and
55
* that allow listeners to be added for shutdown signals
6-
*
6+
*
77
* @see ShutdownListener
88
* @see ShutdownSignalException
99
*/
1010
public interface ShutdownNotifier {
1111
/**
1212
* Add shutdown listener.
1313
* If the component is already closed, handler is fired immediately
14-
*
14+
*
1515
* @param listener {@link ShutdownListener} to the component
1616
*/
1717
public void addShutdownListener(ShutdownListener listener);
18-
18+
1919
/**
2020
* Remove shutdown listener for the component.
21-
*
21+
*
2222
* @param listener {@link ShutdownListener} to be removed
2323
*/
2424
public void removeShutdownListener(ShutdownListener listener);
25-
25+
2626
/**
2727
* Get the shutdown reason object
2828
* @return ShutdownSignalException if component is closed, null otherwise
2929
*/
3030
public ShutdownSignalException getCloseReason();
31-
31+
3232
/**
3333
* Protected API - notify the listeners attached to the component
3434
* @see com.rabbitmq.client.ShutdownListener
3535
*/
3636
public void notifyListeners();
37-
37+
3838
/**
3939
* Determine whether the component is currently open.
4040
* Will return false if we are currently closing.
4141
* Checking this method should be only for information,
4242
* because of the race conditions - state can change after the call.
4343
* Instead just execute and try to catch ShutdownSignalException
4444
* and IOException
45-
*
45+
*
4646
* @return true when component is open, false otherwise
4747
*/
4848
boolean isOpen();

src/com/rabbitmq/client/ShutdownSignalException.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class ShutdownSignalException extends RuntimeException {
5656
* @param reason Object describing the origin of the exception
5757
* @param ref Reference to Connection or Channel that fired the signal
5858
*/
59-
public ShutdownSignalException(boolean hardError,
59+
public ShutdownSignalException(boolean hardError,
6060
boolean initiatedByApplication,
6161
Object reason, Object ref)
6262
{
@@ -69,16 +69,16 @@ public ShutdownSignalException(boolean hardError,
6969

7070
/** @return true if this signals a connection error, or false if a channel error */
7171
public boolean isHardError() { return _hardError; }
72-
72+
7373
/** @return true if this exception was caused by explicit application
7474
* action; false if it originated with the broker or as a result
7575
* of detectable non-deliberate application failure
7676
*/
7777
public boolean isInitiatedByApplication() { return _initiatedByApplication; }
78-
78+
7979
/** @return the reason object, if any */
8080
public Object getReason() { return _reason; }
81-
81+
8282
/** @return Reference to Connection or Channel object that fired the signal **/
8383
public Object getReference() { return _ref; }
8484

src/com/rabbitmq/client/UnexpectedFrameError.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ public Frame getReceivedFrame() {
5151

5252
public int getExpectedFrameType() {
5353
return _expectedFrameType;
54-
}
54+
}
5555
}

src/com/rabbitmq/client/impl/AMQChannel.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* Base class modelling an AMQ channel. Subclasses implement close()
3939
* and processAsync(), and may choose to override
4040
* processShutdownSignal().
41-
*
41+
*
4242
* @see ChannelN
4343
* @see Connection
4444
*/
@@ -116,18 +116,18 @@ public AMQCommand exnWrappingRpc(Method m)
116116
try {
117117
return rpc(m);
118118
} catch (AlreadyClosedException ace) {
119-
// Do not wrap it since it means that connection/channel
120-
// was closed in some action in the past
121-
throw ace;
119+
// Do not wrap it since it means that connection/channel
120+
// was closed in some action in the past
121+
throw ace;
122122
} catch (ShutdownSignalException ex) {
123123
throw wrap(ex);
124124
}
125125
}
126-
126+
127127
/**
128128
* Private API - handle a command which has been assembled
129129
* @throws IOException if there's any problem
130-
*
130+
*
131131
* @param command the incoming command
132132
* @throws IOException
133133
*/
@@ -212,7 +212,7 @@ public AMQCommand quiescingRpc(Method m,
212212
final AMQCommand timeoutReply)
213213
throws IOException, ShutdownSignalException, TimeoutException
214214
{
215-
SimpleBlockingRpcContinuation k = new SimpleBlockingRpcContinuation();
215+
SimpleBlockingRpcContinuation k = new SimpleBlockingRpcContinuation();
216216
transmitAndEnqueue(m, k);
217217
return k.getReply(timeoutMillisec);
218218
}
@@ -274,7 +274,7 @@ public T getReply() throws ShutdownSignalException
274274
{
275275
return _blocker.uninterruptibleGetValue();
276276
}
277-
277+
278278
public T getReply(int timeout)
279279
throws ShutdownSignalException, TimeoutException
280280
{

0 commit comments

Comments
 (0)