Skip to content

Commit 77e59b2

Browse files
Ashok-Varmatemawi
authored andcommittedApr 22, 2024·
cronet: Update to StandardCharsets and assertNotNull API's
1 parent 163efa3 commit 77e59b2

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed
 

‎cronet/src/main/java/io/grpc/cronet/CronetClientStream.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import io.grpc.internal.WritableBuffer;
4343
import java.nio.Buffer;
4444
import java.nio.ByteBuffer;
45-
import java.nio.charset.Charset;
45+
import java.nio.charset.StandardCharsets;
4646
import java.util.ArrayList;
4747
import java.util.Collection;
4848
import java.util.Collections;
@@ -372,10 +372,10 @@ private void setGrpcHeaders(BidirectionalStream.Builder builder) {
372372
// String and byte array.
373373
byte[][] serializedHeaders = TransportFrameUtil.toHttp2Headers(headers);
374374
for (int i = 0; i < serializedHeaders.length; i += 2) {
375-
String key = new String(serializedHeaders[i], Charset.forName("UTF-8"));
375+
String key = new String(serializedHeaders[i], StandardCharsets.UTF_8);
376376
// TODO(ericgribkoff): log an error or throw an exception
377377
if (isApplicationHeader(key)) {
378-
String value = new String(serializedHeaders[i + 1], Charset.forName("UTF-8"));
378+
String value = new String(serializedHeaders[i + 1], StandardCharsets.UTF_8);
379379
builder.addHeader(key, value);
380380
}
381381
}
@@ -552,8 +552,8 @@ private void reportHeaders(List<Map.Entry<String, String>> headers, boolean endO
552552

553553
byte[][] headerValues = new byte[headerList.size()][];
554554
for (int i = 0; i < headerList.size(); i += 2) {
555-
headerValues[i] = headerList.get(i).getBytes(Charset.forName("UTF-8"));
556-
headerValues[i + 1] = headerList.get(i + 1).getBytes(Charset.forName("UTF-8"));
555+
headerValues[i] = headerList.get(i).getBytes(StandardCharsets.UTF_8);
556+
headerValues[i + 1] = headerList.get(i + 1).getBytes(StandardCharsets.UTF_8);
557557
}
558558
Metadata metadata =
559559
InternalMetadata.newMetadata(TransportFrameUtil.toRawSerializedHeaders(headerValues));

‎cronet/src/test/java/io/grpc/cronet/CronetClientStreamTest.java

+9-8
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import static org.junit.Assert.assertEquals;
2020
import static org.junit.Assert.assertFalse;
21+
import static org.junit.Assert.assertNotNull;
2122
import static org.junit.Assert.assertTrue;
2223
import static org.mockito.ArgumentMatchers.any;
2324
import static org.mockito.ArgumentMatchers.eq;
@@ -46,7 +47,7 @@
4647
import java.io.ByteArrayInputStream;
4748
import java.nio.Buffer;
4849
import java.nio.ByteBuffer;
49-
import java.nio.charset.Charset;
50+
import java.nio.charset.StandardCharsets;
5051
import java.util.ArrayList;
5152
import java.util.HashMap;
5253
import java.util.List;
@@ -102,7 +103,7 @@ void setStream(CronetClientStream stream) {
102103
@Override
103104
@SuppressWarnings("GuardedBy")
104105
public void run() {
105-
assertTrue(stream != null);
106+
assertNotNull(stream);
106107
stream.transportState().start(factory);
107108
}
108109
}
@@ -168,7 +169,7 @@ public void write() {
168169
for (int i = 0; i < 5; ++i) {
169170
requests[i] = "request" + i;
170171
buffers[i] = allocator.allocate(requests[i].length());
171-
buffers[i].write(requests[i].getBytes(Charset.forName("UTF-8")), 0, requests[i].length());
172+
buffers[i].write(requests[i].getBytes(StandardCharsets.UTF_8), 0, requests[i].length());
172173
// The 3rd and 5th writeFrame calls have flush=true.
173174
clientStream.abstractClientStreamSink().writeFrame(buffers[i], false, i == 2 || i == 4, 1);
174175
}
@@ -253,7 +254,7 @@ public void read() {
253254
callback.onReadCompleted(
254255
cronetStream,
255256
info,
256-
createMessageFrame(new String("response1").getBytes(Charset.forName("UTF-8"))),
257+
createMessageFrame("response1".getBytes(StandardCharsets.UTF_8)),
257258
false);
258259
// Haven't request any message, so no callback is called here.
259260
verify(clientListener, times(0)).messagesAvailable(isA(MessageProducer.class));
@@ -283,9 +284,9 @@ public void streamSucceeded() {
283284
verify(cronetStream, times(0)).write(isA(ByteBuffer.class), isA(Boolean.class));
284285
// Send the first data frame.
285286
CronetWritableBufferAllocator allocator = new CronetWritableBufferAllocator();
286-
String request = new String("request");
287+
String request = "request";
287288
WritableBuffer writableBuffer = allocator.allocate(request.length());
288-
writableBuffer.write(request.getBytes(Charset.forName("UTF-8")), 0, request.length());
289+
writableBuffer.write(request.getBytes(StandardCharsets.UTF_8), 0, request.length());
289290
clientStream.abstractClientStreamSink().writeFrame(writableBuffer, false, true, 1);
290291
ArgumentCaptor<ByteBuffer> bufferCaptor = ArgumentCaptor.forClass(ByteBuffer.class);
291292
verify(cronetStream, times(1)).write(bufferCaptor.capture(), isA(Boolean.class));
@@ -304,7 +305,7 @@ public void streamSucceeded() {
304305
callback.onReadCompleted(
305306
cronetStream,
306307
info,
307-
createMessageFrame(new String("response").getBytes(Charset.forName("UTF-8"))),
308+
createMessageFrame("response".getBytes(StandardCharsets.UTF_8)),
308309
false);
309310
verify(clientListener, times(1)).messagesAvailable(isA(MessageProducer.class));
310311
verify(cronetStream, times(2)).read(isA(ByteBuffer.class));
@@ -680,7 +681,7 @@ public void getUnaryRequest() {
680681
.newBidirectionalStreamBuilder(
681682
isA(String.class), isA(BidirectionalStream.Callback.class), isA(Executor.class));
682683

683-
byte[] msg = "request".getBytes(Charset.forName("UTF-8"));
684+
byte[] msg = "request".getBytes(StandardCharsets.UTF_8);
684685
stream.writeMessage(new ByteArrayInputStream(msg));
685686
// We still haven't built the stream or sent anything.
686687
verify(cronetStream, times(0)).write(isA(ByteBuffer.class), isA(Boolean.class));

‎cronet/src/test/java/io/grpc/cronet/CronetClientTransportTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package io.grpc.cronet;
1818

1919
import static org.junit.Assert.assertEquals;
20-
import static org.junit.Assert.assertTrue;
20+
import static org.junit.Assert.assertNotNull;
2121
import static org.mockito.ArgumentMatchers.any;
2222
import static org.mockito.Mockito.mock;
2323
import static org.mockito.Mockito.times;
@@ -91,7 +91,7 @@ public void setUp() {
9191
false,
9292
false);
9393
Runnable callback = transport.start(clientTransportListener);
94-
assertTrue(callback != null);
94+
assertNotNull(callback);
9595
callback.run();
9696
verify(clientTransportListener).transportReady();
9797
}

0 commit comments

Comments
 (0)
Please sign in to comment.