Skip to content

Commit 3220a2d

Browse files
committed
inline joinValues()
1 parent 9727739 commit 3220a2d

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

servlet/src/main/java/io/grpc/servlet/ServletServerStream.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import java.util.concurrent.CountDownLatch;
4747
import java.util.concurrent.TimeUnit;
4848
import java.util.function.BiConsumer;
49+
import java.util.function.BiFunction;
4950
import java.util.function.Supplier;
5051
import java.util.logging.Logger;
5152
import javax.annotation.Nullable;
@@ -283,8 +284,8 @@ public void writeTrailers(Metadata trailers, boolean headersSent, Status status)
283284
if (!headersSent) {
284285
writeHeadersToServletResponse(trailers);
285286
} else {
286-
serializeHeaders(trailers, (key, value) ->
287-
trailerSupplier.get().merge(key, value, TrailerSupplier::joinValues));
287+
BiFunction<String, String, String> merge = (oldV, newV) -> oldV + "," + newV;
288+
serializeHeaders(trailers, (key, value) -> trailerSupplier.get().merge(key, value, merge));
288289
}
289290

290291
writer.complete();
@@ -322,10 +323,6 @@ private static final class TrailerSupplier implements Supplier<Map<String, Strin
322323
public Map<String, String> get() {
323324
return trailers;
324325
}
325-
326-
static String joinValues(String oldValue, String newValue) {
327-
return oldValue + "," + newValue;
328-
}
329326
}
330327

331328
static String toHexString(byte[] bytes, int length) {

0 commit comments

Comments
 (0)