fix imports and formatting

googleapis · May 12, 2021 · bfc1e86 · bfc1e86
1 parent c4b430c
commit bfc1e86
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/oauth2_http/java/com/google/auth/http/HttpCredentialsAdapter.java b/oauth2_http/java/com/google/auth/http/HttpCredentialsAdapter.java
@@ -70,7 +70,7 @@ public HttpCredentialsAdapter(Credentials credentials) {
   }
 
   /** A getter for the credentials instance being used */
-  public Credentials getCredentials(){
+  public Credentials getCredentials() {
     return credentials;
   }
 

diff --git a/oauth2_http/javatests/com/google/auth/http/HttpCredentialsAdapterTest.java b/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));
   }
 }
diff --git a/oauth2_http/pom.xml b/oauth2_http/pom.xml
@@ -141,5 +141,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-core</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>