diff options
| author | Carl Mastrangelo <notcarl@google.com> | 2018-09-14 13:52:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-14 13:52:29 -0700 |
| commit | b0f423295b4674cb5247a6143fd211b050ef0065 (patch) | |
| tree | d08aeb9c76673564258fc3b178223fe2dbf969c0 /cronet | |
| parent | 6cf849a7ceb0b223a497dff02742b2f76e1cbaa7 (diff) | |
| download | grpc-grpc-java-b0f423295b4674cb5247a6143fd211b050ef0065.tar.gz | |
all: use Java7 brackets
Diffstat (limited to 'cronet')
3 files changed, 4 insertions, 4 deletions
diff --git a/cronet/src/main/java/io/grpc/cronet/CronetCallOptions.java b/cronet/src/main/java/io/grpc/cronet/CronetCallOptions.java index 46f002804..d361d0b4d 100644 --- a/cronet/src/main/java/io/grpc/cronet/CronetCallOptions.java +++ b/cronet/src/main/java/io/grpc/cronet/CronetCallOptions.java @@ -51,9 +51,9 @@ public final class CronetCallOptions { Collection<Object> existingAnnotations = callOptions.getOption(CRONET_ANNOTATIONS_KEY); ArrayList<Object> newAnnotations; if (existingAnnotations == null) { - newAnnotations = new ArrayList<Object>(); + newAnnotations = new ArrayList<>(); } else { - newAnnotations = new ArrayList<Object>(existingAnnotations); + newAnnotations = new ArrayList<>(existingAnnotations); } newAnnotations.add(annotation); return callOptions.withOption( diff --git a/cronet/src/main/java/io/grpc/cronet/CronetClientStream.java b/cronet/src/main/java/io/grpc/cronet/CronetClientStream.java index de0bc629b..b9a8a43b2 100644 --- a/cronet/src/main/java/io/grpc/cronet/CronetClientStream.java +++ b/cronet/src/main/java/io/grpc/cronet/CronetClientStream.java @@ -504,7 +504,7 @@ class CronetClientStream extends AbstractClientStream { private void reportHeaders(List<Map.Entry<String, String>> headers, boolean endOfStream) { // TODO(ericgribkoff): create new utility methods to eliminate all these conversions - List<String> headerList = new ArrayList<String>(); + List<String> headerList = new ArrayList<>(); for (Map.Entry<String, String> entry : headers) { headerList.add(entry.getKey()); headerList.add(entry.getValue()); diff --git a/cronet/src/main/java/io/grpc/cronet/CronetClientTransport.java b/cronet/src/main/java/io/grpc/cronet/CronetClientTransport.java index 63190e714..38b871d33 100644 --- a/cronet/src/main/java/io/grpc/cronet/CronetClientTransport.java +++ b/cronet/src/main/java/io/grpc/cronet/CronetClientTransport.java @@ -188,7 +188,7 @@ class CronetClientTransport implements ConnectionClientTransport { synchronized (lock) { // A copy is always necessary since cancel() can call finishStream() which calls // streams.remove() - streamsCopy = new ArrayList<CronetClientStream>(streams); + streamsCopy = new ArrayList<>(streams); } for (int i = 0; i < streamsCopy.size(); i++) { // Avoid deadlock by calling into stream without lock held |