all: use Java7 brackets

4 files changed, 19 insertions, 19 deletions

diff --git a/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer.java b/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer.java
index 4d069c0b7..a97b2ded9 100644
--- a/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer.java
+++ b/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer.java
@@ -87,8 +87,8 @@ class GrpclbLoadBalancer extends LoadBalancer implements InternalWithLogId {
   public void handleResolvedAddressGroups(
       List<EquivalentAddressGroup> updatedServers, Attributes attributes) {
     // LB addresses and backend addresses are treated separately
-    List<LbAddressGroup> newLbAddressGroups = new ArrayList<LbAddressGroup>();
-    List<EquivalentAddressGroup> newBackendServers = new ArrayList<EquivalentAddressGroup>();
+    List<LbAddressGroup> newLbAddressGroups = new ArrayList<>();
+    List<EquivalentAddressGroup> newBackendServers = new ArrayList<>();
     for (EquivalentAddressGroup server : updatedServers) {
       String lbAddrAuthority = server.getAttributes().get(GrpcAttributes.ATTR_LB_ADDR_AUTHORITY);
       if (lbAddrAuthority != null) {
diff --git a/grpclb/src/main/java/io/grpc/grpclb/GrpclbState.java b/grpclb/src/main/java/io/grpc/grpclb/GrpclbState.java
index bf170cd9a..95ad81341 100644
--- a/grpclb/src/main/java/io/grpc/grpclb/GrpclbState.java
+++ b/grpclb/src/main/java/io/grpc/grpclb/GrpclbState.java
@@ -238,8 +238,8 @@ final class GrpclbState {
     usingFallbackBackends = true;
     logger.log(Level.INFO, "[{0}] Using fallback: {1}", new Object[] {logId, fallbackBackendList});
 
-    List<DropEntry> newDropList = new ArrayList<DropEntry>();
-    List<BackendAddressGroup> newBackendAddrList = new ArrayList<BackendAddressGroup>();
+    List<DropEntry> newDropList = new ArrayList<>();
+    List<BackendAddressGroup> newBackendAddrList = new ArrayList<>();
     for (EquivalentAddressGroup eag : fallbackBackendList) {
       newDropList.add(null);
       newBackendAddrList.add(new BackendAddressGroup(eag, null));
@@ -348,7 +348,7 @@ final class GrpclbState {
          new Object[] {logId, newBackendAddrList, newDropList});
     HashMap<EquivalentAddressGroup, Subchannel> newSubchannelMap =
         new HashMap<EquivalentAddressGroup, Subchannel>();
-    List<BackendEntry> newBackendList = new ArrayList<BackendEntry>();
+    List<BackendEntry> newBackendList = new ArrayList<>();
 
     for (BackendAddressGroup backendAddr : newBackendAddrList) {
       EquivalentAddressGroup eag = backendAddr.getAddresses();
@@ -572,8 +572,8 @@ final class GrpclbState {
       balancerWorking = true;
       // TODO(zhangkun83): handle delegate from initialResponse
       ServerList serverList = response.getServerList();
-      List<DropEntry> newDropList = new ArrayList<DropEntry>();
-      List<BackendAddressGroup> newBackendAddrList = new ArrayList<BackendAddressGroup>();
+      List<DropEntry> newDropList = new ArrayList<>();
+      List<BackendAddressGroup> newBackendAddrList = new ArrayList<>();
       // Construct the new collections. Create new Subchannels when necessary.
       for (Server server : serverList.getServersList()) {
         String token = server.getLoadBalanceToken();
@@ -673,7 +673,7 @@ final class GrpclbState {
    * changed since the last picker created.
    */
   private void maybeUpdatePicker() {
-    List<RoundRobinEntry> pickList = new ArrayList<RoundRobinEntry>(backendList.size());
+    List<RoundRobinEntry> pickList = new ArrayList<>(backendList.size());
     Status error = null;
     boolean hasIdle = false;
     for (BackendEntry entry : backendList) {
@@ -728,7 +728,7 @@ final class GrpclbState {
 
   private LbAddressGroup flattenLbAddressGroups(List<LbAddressGroup> groupList) {
     assert !groupList.isEmpty();
-    List<EquivalentAddressGroup> eags = new ArrayList<EquivalentAddressGroup>(groupList.size());
+    List<EquivalentAddressGroup> eags = new ArrayList<>(groupList.size());
     String authority = groupList.get(0).getAuthority();
     for (LbAddressGroup group : groupList) {
       if (!authority.equals(group.getAuthority())) {
@@ -758,7 +758,7 @@ final class GrpclbState {
    */
   private static EquivalentAddressGroup flattenEquivalentAddressGroup(
       List<EquivalentAddressGroup> groupList, Attributes attrs) {
-    List<SocketAddress> addrs = new ArrayList<SocketAddress>();
+    List<SocketAddress> addrs = new ArrayList<>();
     for (EquivalentAddressGroup group : groupList) {
       addrs.addAll(group.getAddresses());
     }
diff --git a/grpclb/src/test/java/io/grpc/grpclb/CachedSubchannelPoolTest.java b/grpclb/src/test/java/io/grpc/grpclb/CachedSubchannelPoolTest.java
index 62f8c6c97..9c5151f39 100644
--- a/grpclb/src/test/java/io/grpc/grpclb/CachedSubchannelPoolTest.java
+++ b/grpclb/src/test/java/io/grpc/grpclb/CachedSubchannelPoolTest.java
@@ -70,7 +70,7 @@ public class CachedSubchannelPoolTest {
   private final Helper helper = mock(Helper.class);
   private final FakeClock clock = new FakeClock();
   private final CachedSubchannelPool pool = new CachedSubchannelPool();
-  private final ArrayList<Subchannel> mockSubchannels = new ArrayList<Subchannel>();
+  private final ArrayList<Subchannel> mockSubchannels = new ArrayList<>();
 
   @Before
   public void setUp() {
diff --git a/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancerTest.java b/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancerTest.java
index 60027b9e0..e54052810 100644
--- a/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancerTest.java
+++ b/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancerTest.java
@@ -150,9 +150,9 @@ public class GrpclbLoadBalancerTest {
       new LinkedList<StreamObserver<LoadBalanceRequest>>();
   private final LinkedList<Subchannel> mockSubchannels = new LinkedList<Subchannel>();
   private final LinkedList<ManagedChannel> fakeOobChannels = new LinkedList<ManagedChannel>();
-  private final ArrayList<Subchannel> subchannelTracker = new ArrayList<Subchannel>();
-  private final ArrayList<ManagedChannel> oobChannelTracker = new ArrayList<ManagedChannel>();
-  private final ArrayList<String> failingLbAuthorities = new ArrayList<String>();
+  private final ArrayList<Subchannel> subchannelTracker = new ArrayList<>();
+  private final ArrayList<ManagedChannel> oobChannelTracker = new ArrayList<>();
+  private final ArrayList<String> failingLbAuthorities = new ArrayList<>();
   private final TimeProvider timeProvider = new TimeProvider() {
       @Override
       public long currentTimeNanos() {
@@ -1305,8 +1305,8 @@ public class GrpclbLoadBalancerTest {
 
   private List<Subchannel> fallbackTestVerifyUseOfBalancerBackendLists(
       InOrder inOrder, List<ServerEntry> servers) {
-    ArrayList<EquivalentAddressGroup> addrs = new ArrayList<EquivalentAddressGroup>();
-    ArrayList<String> tokens = new ArrayList<String>();
+    ArrayList<EquivalentAddressGroup> addrs = new ArrayList<>();
+    ArrayList<String> tokens = new ArrayList<>();
     for (ServerEntry server : servers) {
       addrs.add(new EquivalentAddressGroup(server.addr, LB_BACKEND_ATTRS));
       tokens.add(server.token);
@@ -1327,7 +1327,7 @@ public class GrpclbLoadBalancerTest {
     assertThat(picker.dropList).containsExactlyElementsIn(Collections.nCopies(addrs.size(), null));
     assertThat(picker.pickList).containsExactly(GrpclbState.BUFFER_ENTRY);
     assertEquals(addrs.size(), mockSubchannels.size());
-    ArrayList<Subchannel> subchannels = new ArrayList<Subchannel>(mockSubchannels);
+    ArrayList<Subchannel> subchannels = new ArrayList<>(mockSubchannels);
     mockSubchannels.clear();
     for (Subchannel subchannel : subchannels) {
       deliverSubchannelState(subchannel, ConnectivityStateInfo.forNonError(CONNECTING));
@@ -1337,7 +1337,7 @@ public class GrpclbLoadBalancerTest {
     inOrder.verify(helper, never())
         .updateBalancingState(any(ConnectivityState.class), any(SubchannelPicker.class));
 
-    ArrayList<BackendEntry> pickList = new ArrayList<BackendEntry>();
+    ArrayList<BackendEntry> pickList = new ArrayList<>();
     for (int i = 0; i < addrs.size(); i++) {
       Subchannel subchannel = subchannels.get(i);
       BackendEntry backend;
@@ -1521,7 +1521,7 @@ public class GrpclbLoadBalancerTest {
   }
 
   private static List<EquivalentAddressGroup> createResolvedServerAddresses(boolean ... isLb) {
-    ArrayList<EquivalentAddressGroup> list = new ArrayList<EquivalentAddressGroup>();
+    ArrayList<EquivalentAddressGroup> list = new ArrayList<>();
     for (int i = 0; i < isLb.length; i++) {
       SocketAddress addr = new FakeSocketAddress("fake-address-" + i);
       EquivalentAddressGroup eag =