Skip to content

Commit df65bef

Browse files
zhangkun83zhangkun83
authored
core: delete outboundMessage() and inboundMessage() on StreamTracer. (grpc#4014)
They were deprecated in 1.7.0.
1 parent 0465bb5 commit df65bef

File tree

10 files changed

+0
-71
lines changed

10 files changed

+0
-71
lines changed

‎core/src/main/java/io/grpc/StreamTracer.java‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,6 @@ public abstract class StreamTracer {
3232
public void streamClosed(Status status) {
3333
}
3434

35-
/**
36-
* An outbound message has been passed to the stream. This is called as soon as the stream knows
37-
* about the message, but doesn't have further guarantee such as whether the message is serialized
38-
* or not.
39-
*
40-
* @deprecated use {@link #outboundMessage(int)}
41-
*/
42-
@Deprecated
43-
public void outboundMessage() {
44-
}
45-
4635
/**
4736
* An outbound message has been passed to the stream. This is called as soon as the stream knows
4837
* about the message, but doesn't have further guarantee such as whether the message is serialized
@@ -54,17 +43,6 @@ public void outboundMessage() {
5443
public void outboundMessage(int seqNo) {
5544
}
5645

57-
/**
58-
* An inbound message has been received by the stream. This is called as soon as the stream knows
59-
* about the message, but doesn't have further guarantee such as whether the message is
60-
* deserialized or not.
61-
*
62-
* @deprecated use {@link #inboundMessage(int)}
63-
*/
64-
@Deprecated
65-
public void inboundMessage() {
66-
}
67-
6846
/**
6947
* An inbound message has been received by the stream. This is called as soon as the stream knows
7048
* about the message, but doesn't have further guarantee such as whether the message is

‎core/src/main/java/io/grpc/internal/StatsTraceContext.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,9 @@ public void streamClosed(Status status) {
154154
*
155155
* <p>Called from {@link io.grpc.internal.Framer}.
156156
*/
157-
@SuppressWarnings("deprecation")
158157
public void outboundMessage(int seqNo) {
159158
for (StreamTracer tracer : tracers) {
160159
tracer.outboundMessage(seqNo);
161-
tracer.outboundMessage();
162160
}
163161
}
164162

@@ -167,11 +165,9 @@ public void outboundMessage(int seqNo) {
167165
*
168166
* <p>Called from {@link io.grpc.internal.MessageDeframer}.
169167
*/
170-
@SuppressWarnings("deprecation")
171168
public void inboundMessage(int seqNo) {
172169
for (StreamTracer tracer : tracers) {
173170
tracer.inboundMessage(seqNo);
174-
tracer.inboundMessage();
175171
}
176172
}
177173

‎core/src/test/java/io/grpc/internal/AbstractClientStreamTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@ public void getRequest() {
350350
.writeFrame(
351351
any(WritableBuffer.class), any(Boolean.class), any(Boolean.class), any(Integer.class));
352352
assertThat(tracer.nextOutboundEvent()).isEqualTo("outboundMessage(0)");
353-
assertThat(tracer.nextOutboundEvent()).isEqualTo("outboundMessage()");
354353
assertThat(tracer.nextOutboundEvent()).matches("outboundMessageSent\\(0, [0-9]+, [0-9]+\\)");
355354
assertNull(tracer.nextOutboundEvent());
356355
assertNull(tracer.nextInboundEvent());

‎core/src/test/java/io/grpc/internal/MessageDeframerTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,6 @@ private static void checkStats(
490490
long expectedUncompressedSize = 0;
491491
for (int i = 0; i < count; i++) {
492492
assertEquals("inboundMessage(" + i + ")", tracer.nextInboundEvent());
493-
assertEquals("inboundMessage()", tracer.nextInboundEvent());
494493
assertEquals(
495494
String.format("inboundMessageRead(%d, %d, -1)", i, sizes[i * 2]),
496495
tracer.nextInboundEvent());

‎core/src/test/java/io/grpc/internal/MessageFramerTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,6 @@ private void checkStats(long... sizes) {
382382
long expectedUncompressedSize = 0;
383383
for (int i = 0; i < count; i++) {
384384
assertEquals("outboundMessage(" + i + ")", tracer.nextOutboundEvent());
385-
assertEquals("outboundMessage()", tracer.nextOutboundEvent());
386385
assertEquals(
387386
String.format("outboundMessageSent(%d, %d, %d)", i, sizes[i * 2], sizes[i * 2 + 1]),
388387
tracer.nextOutboundEvent());

‎interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1912,7 +1912,6 @@ private void checkTracers(
19121912
int seqNo = 0;
19131913
for (MessageLite msg : sentMessages) {
19141914
assertThat(tracer.nextOutboundEvent()).isEqualTo(String.format("outboundMessage(%d)", seqNo));
1915-
assertThat(tracer.nextOutboundEvent()).isEqualTo("outboundMessage()");
19161915
assertThat(tracer.nextOutboundEvent()).matches(
19171916
String.format("outboundMessageSent\\(%d, -?[0-9]+, -?[0-9]+\\)", seqNo));
19181917
seqNo++;
@@ -1923,7 +1922,6 @@ private void checkTracers(
19231922
seqNo = 0;
19241923
for (MessageLite msg : receivedMessages) {
19251924
assertThat(tracer.nextInboundEvent()).isEqualTo(String.format("inboundMessage(%d)", seqNo));
1926-
assertThat(tracer.nextInboundEvent()).isEqualTo("inboundMessage()");
19271925
assertThat(tracer.nextInboundEvent()).matches(
19281926
String.format("inboundMessageRead\\(%d, -?[0-9]+, -?[0-9]+\\)", seqNo));
19291927
uncompressedReceivedSize += msg.getSerializedSize();

‎testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,6 @@ public void basicStream() throws Exception {
685685
assertTrue(clientStream.isReady());
686686
clientStream.writeMessage(methodDescriptor.streamRequest("Hello!"));
687687
assertThat(clientStreamTracer1.nextOutboundEvent()).isEqualTo("outboundMessage(0)");
688-
assertThat(clientStreamTracer1.nextOutboundEvent()).isEqualTo("outboundMessage()");
689688

690689
clientStream.flush();
691690
InputStream message = serverStreamListener.messageQueue.poll(TIMEOUT_MS, TimeUnit.MILLISECONDS);
@@ -701,7 +700,6 @@ public void basicStream() throws Exception {
701700
assertThat(clientStreamTracer1.getOutboundUncompressedSize()).isEqualTo(0L);
702701
}
703702
assertThat(serverStreamTracer1.nextInboundEvent()).isEqualTo("inboundMessage(0)");
704-
assertThat(serverStreamTracer1.nextInboundEvent()).isEqualTo("inboundMessage()");
705703
assertNull("no additional message expected", serverStreamListener.messageQueue.poll());
706704

707705
clientStream.halfClose();
@@ -739,7 +737,6 @@ public void basicStream() throws Exception {
739737
assertTrue(serverStream.isReady());
740738
serverStream.writeMessage(methodDescriptor.streamResponse("Hi. Who are you?"));
741739
assertThat(serverStreamTracer1.nextOutboundEvent()).isEqualTo("outboundMessage(0)");
742-
assertThat(serverStreamTracer1.nextOutboundEvent()).isEqualTo("outboundMessage()");
743740

744741
serverStream.flush();
745742
message = clientStreamListener.messageQueue.poll(TIMEOUT_MS, TimeUnit.MILLISECONDS);
@@ -755,7 +752,6 @@ public void basicStream() throws Exception {
755752
}
756753
assertTrue(clientStreamTracer1.getInboundHeaders());
757754
assertThat(clientStreamTracer1.nextInboundEvent()).isEqualTo("inboundMessage(0)");
758-
assertThat(clientStreamTracer1.nextInboundEvent()).isEqualTo("inboundMessage()");
759755
assertEquals("Hi. Who are you?", methodDescriptor.parseResponse(message));
760756
assertThat(clientStreamTracer1.nextInboundEvent())
761757
.matches("inboundMessageRead\\(0, -?[0-9]+, -?[0-9]+\\)");

‎testing/src/main/java/io/grpc/internal/testing/TestClientStreamTracer.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -132,23 +132,11 @@ public void streamClosed(Status status) {
132132
delegate.streamClosed(status);
133133
}
134134

135-
@Override
136-
@SuppressWarnings("deprecation")
137-
public void inboundMessage() {
138-
delegate.inboundMessage();
139-
}
140-
141135
@Override
142136
public void inboundMessage(int seqNo) {
143137
delegate.inboundMessage(seqNo);
144138
}
145139

146-
@Override
147-
@SuppressWarnings("deprecation")
148-
public void outboundMessage() {
149-
delegate.outboundMessage();
150-
}
151-
152140
@Override
153141
public void outboundMessage(int seqNo) {
154142
delegate.outboundMessage(seqNo);

‎testing/src/main/java/io/grpc/internal/testing/TestServerStreamTracer.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,23 +111,11 @@ public void streamClosed(Status status) {
111111
delegate.streamClosed(status);
112112
}
113113

114-
@Override
115-
@SuppressWarnings("deprecation")
116-
public void inboundMessage() {
117-
delegate.inboundMessage();
118-
}
119-
120114
@Override
121115
public void inboundMessage(int seqNo) {
122116
delegate.inboundMessage(seqNo);
123117
}
124118

125-
@Override
126-
@SuppressWarnings("deprecation")
127-
public void outboundMessage() {
128-
delegate.outboundMessage();
129-
}
130-
131119
@Override
132120
public void outboundMessage(int seqNo) {
133121
delegate.outboundMessage(seqNo);

‎testing/src/main/java/io/grpc/internal/testing/TestStreamTracer.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -163,23 +163,11 @@ public void streamClosed(Status status) {
163163
}
164164
}
165165

166-
@Override
167-
@SuppressWarnings("deprecation")
168-
public void inboundMessage() {
169-
inboundEvents.add("inboundMessage()");
170-
}
171-
172166
@Override
173167
public void inboundMessage(int seqNo) {
174168
inboundEvents.add("inboundMessage(" + seqNo + ")");
175169
}
176170

177-
@Override
178-
@SuppressWarnings("deprecation")
179-
public void outboundMessage() {
180-
outboundEvents.add("outboundMessage()");
181-
}
182-
183171
@Override
184172
public void outboundMessage(int seqNo) {
185173
outboundEvents.add("outboundMessage(" + seqNo + ")");

0 commit comments

Comments
 (0)