Skip to content

Commit c8dfec9

Browse files
michaelklishinmichaelklishin
authored
Merge pull request #624 from asomov/private-state
Make instance variables in Frame private
2 parents e8c4adb + af44bfb commit c8dfec9

7 files changed

Lines changed: 35 additions & 28 deletions

File tree

‎src/main/java/com/rabbitmq/client/impl/AMQConnection.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -689,10 +689,10 @@ public boolean hasBrokerInitiatedShutdown() {
689689
private void readFrame(Frame frame) throws IOException {
690690
if (frame != null) {
691691
_missedHeartbeats = 0;
692-
if (frame.type == AMQP.FRAME_HEARTBEAT) {
692+
if (frame.getType() == AMQP.FRAME_HEARTBEAT) {
693693
// Ignore it: we've already just reset the heartbeat counter.
694694
} else {
695-
if (frame.channel == 0) { // the special channel
695+
if (frame.getChannel() == 0) { // the special channel
696696
_channel0.handleFrame(frame);
697697
} else {
698698
if (isOpen()) {
@@ -705,7 +705,7 @@ private void readFrame(Frame frame) throws IOException {
705705
if (cm != null) {
706706
ChannelN channel;
707707
try {
708-
channel = cm.getChannel(frame.channel);
708+
channel = cm.getChannel(frame.getChannel());
709709
} catch(UnknownChannelException e) {
710710
// this can happen if channel has been closed,
711711
// but there was e.g. an in-flight delivery.

‎src/main/java/com/rabbitmq/client/impl/CommandAssembler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private void updateContentBodyState() {
8888
}
8989

9090
private void consumeMethodFrame(Frame f) throws IOException {
91-
if (f.type == AMQP.FRAME_METHOD) {
91+
if (f.getType() == AMQP.FRAME_METHOD) {
9292
this.method = AMQImpl.readMethodFrom(f.getInputStream());
9393
this.state = this.method.hasContent() ? CAState.EXPECTING_CONTENT_HEADER : CAState.COMPLETE;
9494
} else {
@@ -97,7 +97,7 @@ private void consumeMethodFrame(Frame f) throws IOException {
9797
}
9898

9999
private void consumeHeaderFrame(Frame f) throws IOException {
100-
if (f.type == AMQP.FRAME_HEADER) {
100+
if (f.getType() == AMQP.FRAME_HEADER) {
101101
this.contentHeader = AMQImpl.readContentHeaderFrom(f.getInputStream());
102102
this.remainingBodyBytes = this.contentHeader.getBodySize();
103103
updateContentBodyState();
@@ -107,7 +107,7 @@ private void consumeHeaderFrame(Frame f) throws IOException {
107107
}
108108

109109
private void consumeBodyFrame(Frame f) {
110-
if (f.type == AMQP.FRAME_BODY) {
110+
if (f.getType() == AMQP.FRAME_BODY) {
111111
byte[] fragment = f.getPayload();
112112
this.remainingBodyBytes -= fragment.length;
113113
updateContentBodyState();

‎src/main/java/com/rabbitmq/client/impl/Frame.java‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,13 @@
2929

3030
/**
3131
* Represents an AMQP wire-protocol frame, with frame type, channel number, and payload bytes.
32-
* TODO: make state private
3332
*/
3433
public class Frame {
3534
/** Frame type code */
36-
public final int type;
35+
private final int type;
3736

3837
/** Frame channel number, 0-65535 */
39-
public final int channel;
38+
private final int channel;
4039

4140
/** Frame payload bytes (for inbound frames) */
4241
private final byte[] payload;
@@ -345,4 +344,12 @@ private static int shortStrSize(String str)
345344
{
346345
return str.getBytes("utf-8").length + 1;
347346
}
347+
348+
public int getType() {
349+
return type;
350+
}
351+
352+
public int getChannel() {
353+
return channel;
354+
}
348355
}

‎src/main/java/com/rabbitmq/client/impl/nio/FrameBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public FrameBuilder(ReadableByteChannel channel, ByteBuffer buffer) {
5959

6060
/**
6161
* Read a frame from the network.
62-
* This method returns null f a frame could not have been fully built from
62+
* This method returns null if a frame could not have been fully built from
6363
* the network. The client must then retry later (typically
6464
* when the channel notifies it has something to read).
6565
*

‎src/test/java/com/rabbitmq/client/test/BrokenFramesTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public class BrokenFramesTest {
6262
} catch (IOException e) {
6363
UnexpectedFrameError unexpectedFrameError = findUnexpectedFrameError(e);
6464
assertNotNull(unexpectedFrameError);
65-
assertEquals(AMQP.FRAME_HEADER, unexpectedFrameError.getReceivedFrame().type);
65+
assertEquals(AMQP.FRAME_HEADER, unexpectedFrameError.getReceivedFrame().getType());
6666
assertEquals(AMQP.FRAME_METHOD, unexpectedFrameError.getExpectedFrameType());
6767
return;
6868
}
@@ -88,7 +88,7 @@ public class BrokenFramesTest {
8888
} catch (IOException e) {
8989
UnexpectedFrameError unexpectedFrameError = findUnexpectedFrameError(e);
9090
assertNotNull(unexpectedFrameError);
91-
assertEquals(AMQP.FRAME_BODY, unexpectedFrameError.getReceivedFrame().type);
91+
assertEquals(AMQP.FRAME_BODY, unexpectedFrameError.getReceivedFrame().getType());
9292
assertEquals(AMQP.FRAME_HEADER, unexpectedFrameError.getExpectedFrameType());
9393
return;
9494
}

‎src/test/java/com/rabbitmq/client/test/FrameBuilderTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ public void buildFrameInOneGo() throws IOException {
5353
builder = new FrameBuilder(channel, buffer);
5454
Frame frame = builder.readFrame();
5555
assertThat(frame, notNullValue());
56-
assertThat(frame.type, is(1));
57-
assertThat(frame.channel, is(0));
56+
assertThat(frame.getType(), is(1));
57+
assertThat(frame.getChannel(), is(0));
5858
assertThat(frame.getPayload().length, is(3));
5959
}
6060

@@ -74,8 +74,8 @@ public void buildFramesInOneGo() throws IOException {
7474
Frame frame;
7575
while ((frame = builder.readFrame()) != null) {
7676
assertThat(frame, notNullValue());
77-
assertThat(frame.type, is(1));
78-
assertThat(frame.channel, is(0));
77+
assertThat(frame.getType(), is(1));
78+
assertThat(frame.getChannel(), is(0));
7979
assertThat(frame.getPayload().length, is(3));
8080
frameCount++;
8181
}
@@ -95,8 +95,8 @@ public void buildFrameInSeveralCalls() throws IOException {
9595

9696
frame = builder.readFrame();
9797
assertThat(frame, notNullValue());
98-
assertThat(frame.type, is(1));
99-
assertThat(frame.channel, is(0));
98+
assertThat(frame.getType(), is(1));
99+
assertThat(frame.getChannel(), is(0));
100100
assertThat(frame.getPayload().length, is(3));
101101
}
102102

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public UnexpectedFrames() {
101101
@Test public void missingHeader() throws IOException {
102102
expectUnexpectedFrameError(new Confuser() {
103103
public Frame confuse(Frame frame) {
104-
if (frame.type == AMQP.FRAME_HEADER) {
104+
if (frame.getType() == AMQP.FRAME_HEADER) {
105105
return null;
106106
}
107107
return frame;
@@ -112,11 +112,11 @@ public Frame confuse(Frame frame) {
112112
@Test public void missingMethod() throws IOException {
113113
expectUnexpectedFrameError(new Confuser() {
114114
public Frame confuse(Frame frame) {
115-
if (frame.type == AMQP.FRAME_METHOD) {
115+
if (frame.getType() == AMQP.FRAME_METHOD) {
116116
// We can't just skip the method as that will lead us to
117117
// send 0 bytes and hang waiting for a response.
118118
return new Frame(AMQP.FRAME_HEADER,
119-
frame.channel, frame.getPayload());
119+
frame.getChannel(), frame.getPayload());
120120
}
121121
return frame;
122122
}
@@ -126,7 +126,7 @@ public Frame confuse(Frame frame) {
126126
@Test public void missingBody() throws IOException {
127127
expectUnexpectedFrameError(new Confuser() {
128128
public Frame confuse(Frame frame) {
129-
if (frame.type == AMQP.FRAME_BODY) {
129+
if (frame.getType() == AMQP.FRAME_BODY) {
130130
return null;
131131
}
132132
return frame;
@@ -137,10 +137,10 @@ public Frame confuse(Frame frame) {
137137
@Test public void wrongClassInHeader() throws IOException {
138138
expectUnexpectedFrameError(new Confuser() {
139139
public Frame confuse(Frame frame) {
140-
if (frame.type == AMQP.FRAME_HEADER) {
140+
if (frame.getType() == AMQP.FRAME_HEADER) {
141141
byte[] payload = frame.getPayload();
142142
Frame confusedFrame = new Frame(AMQP.FRAME_HEADER,
143-
frame.channel, payload);
143+
frame.getChannel(), payload);
144144
// First two bytes = class ID, must match class ID from
145145
// method.
146146
payload[0] = 12;
@@ -155,8 +155,8 @@ public Frame confuse(Frame frame) {
155155
@Test public void heartbeatOnChannel() throws IOException {
156156
expectUnexpectedFrameError(new Confuser() {
157157
public Frame confuse(Frame frame) {
158-
if (frame.type == AMQP.FRAME_METHOD) {
159-
return new Frame(AMQP.FRAME_HEARTBEAT, frame.channel);
158+
if (frame.getType() == AMQP.FRAME_METHOD) {
159+
return new Frame(AMQP.FRAME_HEARTBEAT, frame.getChannel());
160160
}
161161
return frame;
162162
}
@@ -166,8 +166,8 @@ public Frame confuse(Frame frame) {
166166
@Test public void unknownFrameType() throws IOException {
167167
expectError(AMQP.FRAME_ERROR, new Confuser() {
168168
public Frame confuse(Frame frame) {
169-
if (frame.type == AMQP.FRAME_METHOD) {
170-
return new Frame(0, frame.channel,
169+
if (frame.getType() == AMQP.FRAME_METHOD) {
170+
return new Frame(0, frame.getChannel(),
171171
"1234567890\0001234567890".getBytes());
172172
}
173173
return frame;

0 commit comments

Comments
 (0)