Default implementation for newCallCredentials

Author: Zgoda91

xds/src/main/java/io/grpc/xds/XdsCredentialsProvider.java

@@ -51,15 +51,18 @@ public abstract class XdsCredentialsProvider {
   protected abstract ChannelCredentials newChannelCredentials(Map<String, ?> jsonConfig);
 
   /**
-  * Creates a {@link CallCredentials} from the given jsonConfig, or
-  * {@code null} if the given config is invalid. The provider is free to ignore
-  * the config if it's not needed for producing the call credentials.
+  * Creates a {@link CallCredentials} from the given jsonConfig, or {@code null} if the given
+  * config is invalid or credential data is not part of a RPC call. The provider may override
+  * this method. Moreover the provider is free to ignore the config if it's not needed for
+  * producing the call credentials.
   *
   * @param jsonConfig json config that can be consumed by the provider to create
   *                   the call credentials
   *
   */
-  protected abstract CallCredentials newCallCredentials(Map<String, ?> jsonConfig);
+  protected CallCredentials newCallCredentials(Map<String, ?> jsonConfig) {
+    return null;
+  }
 
   /**
    * Returns the xDS credential name associated with this provider which makes it selectable

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

@@ -16,7 +16,6 @@
 
 package io.grpc.xds.internal;
 
-import io.grpc.CallCredentials;
 import io.grpc.ChannelCredentials;
 import io.grpc.alts.GoogleDefaultChannelCredentials;
 import io.grpc.xds.XdsCredentialsProvider;
@@ -34,11 +33,6 @@ protected ChannelCredentials newChannelCredentials(Map<String, ?> jsonConfig) {
     return GoogleDefaultChannelCredentials.create();
   }
 
-  @Override
-  protected CallCredentials newCallCredentials(Map<String, ?> jsonConfig) {
-    return null;
-  }
-
   @Override
   protected String getName() {
     return CREDS_NAME;

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

@@ -16,7 +16,6 @@
 
 package io.grpc.xds.internal;
 
-import io.grpc.CallCredentials;
 import io.grpc.ChannelCredentials;
 import io.grpc.InsecureChannelCredentials;
 import io.grpc.xds.XdsCredentialsProvider;
@@ -34,11 +33,6 @@ protected ChannelCredentials newChannelCredentials(Map<String, ?> jsonConfig) {
     return InsecureChannelCredentials.create();
   }
 
-  @Override
-  protected CallCredentials newCallCredentials(Map<String, ?> jsonConfig) {
-    return null;
-  }
-
   @Override
   protected String getName() {
     return CREDS_NAME;

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

@@ -16,7 +16,6 @@
 
 package io.grpc.xds.internal;
 
-import io.grpc.CallCredentials;
 import io.grpc.ChannelCredentials;
 import io.grpc.TlsChannelCredentials;
 import io.grpc.xds.XdsCredentialsProvider;
@@ -34,11 +33,6 @@ protected ChannelCredentials newChannelCredentials(Map<String, ?> jsonConfig) {
     return TlsChannelCredentials.create();
   }
 
-  @Override
-  protected CallCredentials newCallCredentials(Map<String, ?> jsonConfig) {
-    return null;
-  }
-
   @Override
   protected String getName() {
     return CREDS_NAME;

xds/src/test/java/io/grpc/xds/internal/GoogleDefaultXdsCredentialsProviderTest.java

@@ -16,7 +16,6 @@
 
 package io.grpc.xds.internal;
 
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -55,9 +54,4 @@ public void channelCredentials() {
     assertSame(CompositeChannelCredentials.class,
         provider.newChannelCredentials(null).getClass());
   }
-
-  @Test
-  public void callCredentials() {
-    assertNull(provider.newCallCredentials(null));
-  }
 }

xds/src/test/java/io/grpc/xds/internal/InsecureXdsCredentialsProviderTest.java

@@ -16,7 +16,6 @@
 
 package io.grpc.xds.internal;
 
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -55,9 +54,4 @@ public void channelCredentials() {
     assertSame(InsecureChannelCredentials.class,
         provider.newChannelCredentials(null).getClass());
   }
-
-  @Test
-  public void callCredentials() {
-    assertNull(provider.newCallCredentials(null));
-  }
 }

xds/src/test/java/io/grpc/xds/internal/TlsXdsCredentialsProviderTest.java

@@ -16,7 +16,6 @@
 
 package io.grpc.xds.internal;
 
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -55,9 +54,4 @@ public void channelCredentials() {
     assertSame(TlsChannelCredentials.class,
         provider.newChannelCredentials(null).getClass());
   }
-
-  @Test
-  public void callCredentials() {
-    assertNull(provider.newCallCredentials(null));
-  }
 }