Moving JwtToken related classes to xds package

Author: Zgoda91

alts/build.gradle

@@ -1,6 +1,5 @@
 plugins {
     id "java-library"
-    id "java-test-fixtures"
     id "maven-publish"
 
     id "com.google.protobuf"
@@ -37,9 +36,6 @@ dependencies {
             libraries.mockito.core,
             libraries.truth
 
-    testFixturesImplementation libraries.junit,
-            libraries.guava
-
     testImplementation libraries.guava.testlib
     testRuntimeOnly libraries.netty.tcnative,
             libraries.netty.tcnative.classes
@@ -109,6 +105,3 @@ publishing {
         }
     }
 }
-
-components.java.withVariantsFromConfiguration(configurations.testFixturesApiElements) { skip() }
-components.java.withVariantsFromConfiguration(configurations.testFixturesRuntimeElements) { skip() }

alts/src/main/java/io/grpc/alts/JwtTokenFileCallCredentials.java renamed to xds/src/main/java/io/grpc/xds/JwtTokenFileCallCredentials.java

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package io.grpc.alts;
+package io.grpc.xds;
+
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.json.webtoken.JsonWebSignature;
@@ -33,11 +35,11 @@
  * See gRFC A97 (https://github.com/grpc/proposal/pull/492).
  */
 public final class JwtTokenFileCallCredentials extends OAuth2Credentials {
-  private static final long serialVersionUID = 452556614608513984L;
-  private String path = null;
+  private static final long serialVersionUID = 0L;
+  private final String path;
 
   private JwtTokenFileCallCredentials(String path) {
-    this.path = path;
+    this.path = checkNotNull(path, "path");
   }
 
   @Override

xds/src/main/java/io/grpc/xds/internal/JwtTokenFileXdsCredentialsProvider.java

@@ -18,8 +18,8 @@
 
 import io.grpc.CallCredentials;
 import io.grpc.ChannelCredentials;
-import io.grpc.alts.JwtTokenFileCallCredentials;
 import io.grpc.internal.JsonUtil;
+import io.grpc.xds.JwtTokenFileCallCredentials;
 import io.grpc.xds.XdsCredentialsProvider;
 import java.io.File;
 import java.util.Map;
@@ -28,7 +28,7 @@
  * A wrapper class that supports {@link JwtTokenFileXdsCredentialsProvider} for
  * Xds by implementing {@link XdsCredentialsProvider}.
  */
-public class JwtTokenFileXdsCredentialsProvider extends XdsCredentialsProvider {
+public final class JwtTokenFileXdsCredentialsProvider extends XdsCredentialsProvider {
   private static final String CREDS_NAME = "jwt_token_file";
 
   @Override

alts/src/test/java/io/grpc/alts/JwtTokenFileCallCredentialsTest.java renamed to xds/src/test/java/io/grpc/xds/JwtTokenFileCallCredentialsTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.grpc.alts;
+package io.grpc.xds;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
@@ -30,10 +30,8 @@
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
-import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
@@ -42,15 +40,12 @@
 public class JwtTokenFileCallCredentialsTest {
   @RunWith(JUnit4.class)
   public static class WithEmptyJwtTokenTest {
-    @Rule
-    public TemporaryFolder tempFolder = new TemporaryFolder();
-
     private File jwtTokenFile;
     private JwtTokenFileCallCredentials unit;
 
     @Before
     public void setUp() throws Exception {
-      this.jwtTokenFile = JwtTokenFileTestUtils.createEmptyJwtToken(tempFolder);
+      this.jwtTokenFile = JwtTokenFileTestUtils.createEmptyJwtToken();
 
       Constructor<JwtTokenFileCallCredentials> ctor =
           JwtTokenFileCallCredentials.class.getDeclaredConstructor(String.class);
@@ -68,15 +63,12 @@ public void givenJwtTokenFileEmpty_WhenTokenRefreshed_ExpectException() {
 
   @RunWith(JUnit4.class)
   public static class WithInvalidJwtTokenTest {
-    @Rule
-    public TemporaryFolder tempFolder = new TemporaryFolder();
-
     private File jwtTokenFile;
     private JwtTokenFileCallCredentials unit;
 
     @Before
     public void setUp() throws Exception {
-      this.jwtTokenFile = JwtTokenFileTestUtils.createJwtTokenWithoutExpiration(tempFolder);
+      this.jwtTokenFile = JwtTokenFileTestUtils.createJwtTokenWithoutExpiration();
 
       Constructor<JwtTokenFileCallCredentials> ctor =
           JwtTokenFileCallCredentials.class.getDeclaredConstructor(String.class);
@@ -100,9 +92,6 @@ public void givenJwtTokenFileWithoutExpiration_WhenTokenRefreshed_ExpectExceptio
 
   @RunWith(JUnit4.class)
   public static class WithValidJwtTokenTest {
-    @Rule
-    public TemporaryFolder tempFolder = new TemporaryFolder();
-
     private File jwtTokenFile;
     private JwtTokenFileCallCredentials unit;
     private Long givenExpTimeInSeconds;
@@ -111,8 +100,7 @@ public static class WithValidJwtTokenTest {
     public void setUp() throws Exception {
       this.givenExpTimeInSeconds = Instant.now().getEpochSecond() + TimeUnit.HOURS.toSeconds(1);
 
-      this.jwtTokenFile = JwtTokenFileTestUtils.createValidJwtToken(
-          tempFolder, givenExpTimeInSeconds);
+      this.jwtTokenFile = JwtTokenFileTestUtils.createValidJwtToken(givenExpTimeInSeconds);
 
       Constructor<JwtTokenFileCallCredentials> ctor =
           JwtTokenFileCallCredentials.class.getDeclaredConstructor(String.class);

alts/src/testFixtures/java/io/grpc/alts/JwtTokenFileTestUtils.java renamed to xds/src/test/java/io/grpc/xds/JwtTokenFileTestUtils.java

@@ -14,22 +14,24 @@
  * limitations under the License.
  */
 
-package io.grpc.alts;
+package io.grpc.xds;
 
 import com.google.common.io.BaseEncoding;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import org.junit.rules.TemporaryFolder;
 
 public class JwtTokenFileTestUtils {
-  public static File createEmptyJwtToken(TemporaryFolder tempFolder) throws Exception {
-    File jwtToken = tempFolder.newFile(new String("jwt.token"));
+  public static File createEmptyJwtToken() throws IOException {
+    File jwtToken = File.createTempFile(new String("jwt.token"), "");
+    jwtToken.deleteOnExit();
     return jwtToken;
   }
 
-  public static File createJwtTokenWithoutExpiration(TemporaryFolder tempFolder) throws Exception {
-    File jwtToken = tempFolder.newFile(new String("jwt.token"));
+  public static File createJwtTokenWithoutExpiration() throws IOException {
+    File jwtToken = File.createTempFile(new String("jwt.token"), "");
+    jwtToken.deleteOnExit();
     FileOutputStream outputStream = new FileOutputStream(jwtToken);
     String content =
         BaseEncoding.base64().encode(
@@ -44,9 +46,10 @@ public static File createJwtTokenWithoutExpiration(TemporaryFolder tempFolder) t
     return jwtToken;
   }
 
-  public static File createValidJwtToken(TemporaryFolder tempFolder, Long expTime)
+  public static File createValidJwtToken(long expTime)
         throws Exception {
-    File jwtToken = tempFolder.newFile(new String("jwt.token"));
+    File jwtToken = File.createTempFile(new String("jwt.token"), "");
+    jwtToken.deleteOnExit();
     FileOutputStream outputStream = new FileOutputStream(jwtToken);
     String content =
         BaseEncoding.base64().encode(

xds/src/test/java/io/grpc/xds/SharedXdsClientPoolProviderTest.java

@@ -26,7 +26,6 @@
 
 import com.google.auth.oauth2.AccessToken;
 import com.google.auth.oauth2.OAuth2Credentials;
-import com.google.common.io.BaseEncoding;
 import com.google.common.util.concurrent.SettableFuture;
 import io.grpc.CallCredentials;
 import io.grpc.Grpc;
@@ -38,9 +37,10 @@
 import io.grpc.ServerCall;
 import io.grpc.ServerCallHandler;
 import io.grpc.ServerInterceptor;
-import io.grpc.alts.JwtTokenFileCallCredentials;
 import io.grpc.auth.MoreCallCredentials;
 import io.grpc.internal.ObjectPool;
+import io.grpc.xds.JwtTokenFileCallCredentials;
+import io.grpc.xds.JwtTokenFileTestUtils;
 import io.grpc.xds.SharedXdsClientPoolProvider.RefCountedXdsClientObjectPool;
 import io.grpc.xds.XdsListenerResource.LdsUpdate;
 import io.grpc.xds.client.Bootstrapper.BootstrapInfo;
@@ -50,15 +50,13 @@
 import io.grpc.xds.client.XdsClient.ResourceWatcher;
 import io.grpc.xds.client.XdsInitializationException;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.time.Instant;
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.Mock;
@@ -68,9 +66,6 @@
 /** Tests for {@link SharedXdsClientPoolProvider}. */
 @RunWith(JUnit4.class)
 public class SharedXdsClientPoolProviderTest {
-  @Rule
-  public TemporaryFolder tempFolder = new TemporaryFolder();
-
   private static final String SERVER_URI = "trafficdirector.googleapis.com";
   @Rule
   public final MockitoRule mocks = MockitoJUnit.rule();
@@ -84,24 +79,6 @@ public class SharedXdsClientPoolProviderTest {
   private GrpcBootstrapperImpl bootstrapper;
   @Mock private ResourceWatcher<LdsUpdate> ldsResourceWatcher;
 
-  // TODO (zgoda): How to include this method in alts/testFixtures. Running into build issues atm
-  public static File createValidJwtToken(TemporaryFolder tempFolder, Long expTime)
-        throws Exception {
-    File jwtToken = tempFolder.newFile(new String("jwt.token"));
-    FileOutputStream outputStream = new FileOutputStream(jwtToken);
-    String content =
-        BaseEncoding.base64().encode(
-            new String("{\"typ\": \"JWT\", \"alg\": \"HS256\"}").getBytes(StandardCharsets.UTF_8))
-        + "."
-        + BaseEncoding.base64().encode(
-            String.format("{\"exp\": %d}", expTime).getBytes(StandardCharsets.UTF_8))
-        + "."
-        + BaseEncoding.base64().encode(new String("signature").getBytes(StandardCharsets.UTF_8));
-    outputStream.write(content.getBytes(StandardCharsets.UTF_8));
-    outputStream.close();
-    return jwtToken;
-  }
-
   @Test
   public void noServer() throws XdsInitializationException {
     BootstrapInfo bootstrapInfo =
@@ -246,7 +223,7 @@ public void xdsClient_usesJwtTokenFileCallCredentials() throws Exception {
     GrpcBootstrapperImpl.xdsBootstrapCallCredsEnabled = true;
 
     Long givenExpTimeInSeconds = Instant.now().getEpochSecond() + TimeUnit.HOURS.toSeconds(1);
-    File jwtToken = createValidJwtToken(tempFolder, givenExpTimeInSeconds);
+    File jwtToken = JwtTokenFileTestUtils.createValidJwtToken(givenExpTimeInSeconds);
     String jwtTokenContent = new String(
         Files.readAllBytes(jwtToken.toPath()),
         StandardCharsets.UTF_8);