Remove Headers

2 files changed, 12 insertions, 12 deletions

diff --git a/auth/src/main/java/io/grpc/auth/ClientAuthInterceptor.java b/auth/src/main/java/io/grpc/auth/ClientAuthInterceptor.java
index 6f7574d04..4ed477d84 100644
--- a/auth/src/main/java/io/grpc/auth/ClientAuthInterceptor.java
+++ b/auth/src/main/java/io/grpc/auth/ClientAuthInterceptor.java
@@ -59,7 +59,7 @@ public class ClientAuthInterceptor implements ClientInterceptor {
 
   private final Credentials credentials;
 
-  private Metadata.Headers cached;
+  private Metadata cached;
   private Map<String, List<String>> lastMetadata;
   // TODO(louiscryan): refresh token asynchronously with this executor.
   private Executor executor;
@@ -76,9 +76,9 @@ public class ClientAuthInterceptor implements ClientInterceptor {
     // would be in WWW-Authenticate, because it does not yet have access to the header.
     return new CheckedForwardingClientCall<ReqT, RespT>(next.newCall(method, callOptions)) {
       @Override
-      protected void checkedStart(Listener<RespT> responseListener, Metadata.Headers headers)
+      protected void checkedStart(Listener<RespT> responseListener, Metadata headers)
           throws Exception {
-        Metadata.Headers cachedSaved;
+        Metadata cachedSaved;
         synchronized (ClientAuthInterceptor.this) {
           // TODO(louiscryan): This is icky but the current auth library stores the same
           // metadata map until the next refresh cycle. This will be fixed once
@@ -104,8 +104,8 @@ public class ClientAuthInterceptor implements ClientInterceptor {
     }
   }
 
-  private static final Metadata.Headers toHeaders(Map<String, List<String>> metadata) {
-    Metadata.Headers headers = new Metadata.Headers();
+  private static final Metadata toHeaders(Map<String, List<String>> metadata) {
+    Metadata headers = new Metadata();
     if (metadata != null) {
       for (String key : metadata.keySet()) {
         Metadata.Key<String> headerKey = Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
diff --git a/auth/src/test/java/io/grpc/auth/ClientAuthInterceptorTests.java b/auth/src/test/java/io/grpc/auth/ClientAuthInterceptorTests.java
index cf440c9d7..f0010423e 100644
--- a/auth/src/test/java/io/grpc/auth/ClientAuthInterceptorTests.java
+++ b/auth/src/test/java/io/grpc/auth/ClientAuthInterceptorTests.java
@@ -31,10 +31,10 @@
 
 package io.grpc.auth;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.isA;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Matchers.same;
 import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.same;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -114,7 +114,7 @@ public class ClientAuthInterceptorTests {
     when(credentials.getRequestMetadata()).thenReturn(Multimaps.asMap(values));
     ClientCall<String, Integer> interceptedCall =
         interceptor.interceptCall(descriptor, CallOptions.DEFAULT, channel);
-    Metadata.Headers headers = new Metadata.Headers();
+    Metadata headers = new Metadata();
     interceptedCall.start(listener, headers);
     verify(call).start(listener, headers);
 
@@ -131,7 +131,7 @@ public class ClientAuthInterceptorTests {
     when(credentials.getRequestMetadata()).thenThrow(new IOException("Broken"));
     ClientCall<String, Integer> interceptedCall =
         interceptor.interceptCall(descriptor, CallOptions.DEFAULT, channel);
-    Metadata.Headers headers = new Metadata.Headers();
+    Metadata headers = new Metadata();
     interceptedCall.start(listener, headers);
     ArgumentCaptor<Status> statusCaptor = ArgumentCaptor.forClass(Status.class);
     Mockito.verify(listener).onClose(statusCaptor.capture(), isA(Metadata.class));
@@ -142,7 +142,7 @@ public class ClientAuthInterceptorTests {
   }
 
   @Test
-  public void testWithOAuth2Credential() throws IOException {
+  public void testWithOAuth2Credential() {
     final AccessToken token = new AccessToken("allyourbase", new Date(Long.MAX_VALUE));
     final OAuth2Credentials oAuth2Credentials = new OAuth2Credentials() {
       @Override
@@ -153,7 +153,7 @@ public class ClientAuthInterceptorTests {
     interceptor = new ClientAuthInterceptor(oAuth2Credentials, Executors.newSingleThreadExecutor());
     ClientCall<String, Integer> interceptedCall =
         interceptor.interceptCall(descriptor, CallOptions.DEFAULT, channel);
-    Metadata.Headers headers = new Metadata.Headers();
+    Metadata headers = new Metadata();
     interceptedCall.start(listener, headers);
     verify(call).start(listener, headers);
     Iterable<String> authorization = headers.getAll(AUTHORIZATION);