aboutsummaryrefslogtreecommitdiff
path: root/context
diff options
context:
space:
mode:
authorCarl Mastrangelo <notcarl@google.com>2018-09-14 13:52:29 -0700
committerGitHub <noreply@github.com>2018-09-14 13:52:29 -0700
commitb0f423295b4674cb5247a6143fd211b050ef0065 (patch)
treed08aeb9c76673564258fc3b178223fe2dbf969c0 /context
parent6cf849a7ceb0b223a497dff02742b2f76e1cbaa7 (diff)
downloadgrpc-grpc-java-b0f423295b4674cb5247a6143fd211b050ef0065.tar.gz
all: use Java7 brackets
Diffstat (limited to 'context')
-rw-r--r--context/src/jmh/java/io/grpc/ReadBenchmark.java2
-rw-r--r--context/src/main/java/io/grpc/Context.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/context/src/jmh/java/io/grpc/ReadBenchmark.java b/context/src/jmh/java/io/grpc/ReadBenchmark.java
index 237aa6f8e..fa078ce79 100644
--- a/context/src/jmh/java/io/grpc/ReadBenchmark.java
+++ b/context/src/jmh/java/io/grpc/ReadBenchmark.java
@@ -34,7 +34,7 @@ public class ReadBenchmark {
@State(Scope.Benchmark)
public static class ContextState {
List<Context.Key<Object>> keys = new ArrayList<Context.Key<Object>>();
- List<Context> contexts = new ArrayList<Context>();
+ List<Context> contexts = new ArrayList<>();
@Setup
public void setup() {
diff --git a/context/src/main/java/io/grpc/Context.java b/context/src/main/java/io/grpc/Context.java
index 0e76c08e1..4df0e0f6c 100644
--- a/context/src/main/java/io/grpc/Context.java
+++ b/context/src/main/java/io/grpc/Context.java
@@ -471,7 +471,7 @@ public class Context {
if (listeners == null) {
// Now that we have a listener we need to listen to our parent so
// we can cascade listener notification.
- listeners = new ArrayList<ExecutableListener>();
+ listeners = new ArrayList<>();
listeners.add(executableListener);
if (cancellableAncestor != null) {
cancellableAncestor.addListener(parentListener, DirectExecutor.INSTANCE);