fix imports and formatting

oauth2_http/java/com/google/auth/http/HttpCredentialsAdapter.java

@@ -48,7 +48,9 @@
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
-/** A wrapper for using Credentials with the Google API Client Libraries for Java with Http. */
+/**
+ * A wrapper for using Credentials with the Google API Client Libraries for Java with Http.
+ */
 public class HttpCredentialsAdapter
     implements HttpRequestInitializer, HttpUnsuccessfulResponseHandler {
 
@@ -63,14 +65,18 @@ public class HttpCredentialsAdapter
 
   private final Credentials credentials;
 
-  /** @param credentials Credentials instance to adapt for HTTP */
+  /**
+   * @param credentials Credentials instance to adapt for HTTP
+   */
   public HttpCredentialsAdapter(Credentials credentials) {
     Preconditions.checkNotNull(credentials);
     this.credentials = credentials;
   }
 
-  /** A getter for the credentials instance being used */
-  public Credentials getCredentials(){
+  /**
+   * A getter for the credentials instance being used
+   */
+  public Credentials getCredentials() {
     return credentials;
   }
 

oauth2_http/javatests/com/google/auth/http/HttpCredentialsAdapterTest.java

@@ -31,6 +31,7 @@
 
 package com.google.auth.http;
 
+import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
@@ -40,6 +41,7 @@
 import com.google.api.client.http.HttpRequestFactory;
 import com.google.api.client.http.HttpResponse;
 import com.google.api.client.http.HttpTransport;
+import com.google.auth.Credentials;
 import com.google.auth.oauth2.GoogleCredentialsTest.MockTokenServerTransportFactory;
 import com.google.auth.oauth2.MockTokenCheckingTransport;
 import com.google.auth.oauth2.OAuth2Credentials;
@@ -150,12 +152,10 @@ public void initialize_noURI() throws IOException {
     String authorizationHeader = requestHeaders.getAuthorization();
     assertEquals(authorizationHeader, expectedAuthorization);
   }
-}
 
   @Test
-  public void getCredentials() throws IOException {
+  public void getCredentials() {
     final String accessToken = "1/MkSJoj1xsli0AccessToken_NKPY2";
-    final String expectedAuthorization = InternalAuthHttpConstants.BEARER_PREFIX + accessToken;
     MockTokenServerTransportFactory tokenServerTransportFactory =
         new MockTokenServerTransportFactory();
     tokenServerTransportFactory.transport.addClient(CLIENT_ID, CLIENT_SECRET);
@@ -170,7 +170,7 @@ public void getCredentials() throws IOException {
             .build();
 
     HttpCredentialsAdapter adapter = new HttpCredentialsAdapter(credentials);
-    OAuth2Credentials returnedCredentials = adapter.getCredentials();
-    assertThat(returnedCredentials, instanceOf(OAuth2Credentials.class));
+    Credentials returnedCredentials = adapter.getCredentials();
+    assertThat(returnedCredentials, instanceOf(Credentials.class));
   }
 }