Gardening: AuthenticatorWrapper polish

Motivation
----------
Minimize the impact of forthcoming changes to the
Authenticator interface.

Modifications
-------------
Make AuthenticatorWrapper visible outside its package,
so it can be extended by Columnar's DynamicAuthenticator
and Scala's own PasswordAuthenticator.

Change-Id: Idf846a3adcd449d0ca67b01a12b38e12f427f39f
Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/233960
Tested-by: Build Bot <[email protected]>
Reviewed-by: Michael Reiche <[email protected]>

Author: dnault

columnar-java-client/src/main/java/com/couchbase/columnar/client/java/internal/DynamicAuthenticator.java

@@ -16,15 +16,9 @@
 
 package com.couchbase.columnar.client.java.internal;
 
-import com.couchbase.client.core.deps.io.grpc.CallCredentials;
-import com.couchbase.client.core.deps.io.netty.channel.ChannelPipeline;
-import com.couchbase.client.core.deps.io.netty.handler.codec.http.HttpRequest;
-import com.couchbase.client.core.deps.io.netty.handler.ssl.SslContextBuilder;
-import com.couchbase.client.core.endpoint.EndpointContext;
 import com.couchbase.client.core.env.Authenticator;
-import com.couchbase.client.core.service.ServiceType;
+import com.couchbase.client.core.env.AuthenticatorWrapper;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.Nullable;
 
 import java.util.function.Supplier;
 
@@ -35,40 +29,15 @@
  * given supplier.
  */
 @ApiStatus.Internal
-public class DynamicAuthenticator implements Authenticator {
+public class DynamicAuthenticator extends AuthenticatorWrapper {
   private final Supplier<Authenticator> supplier;
 
   public DynamicAuthenticator(Supplier<Authenticator> supplier) {
     this.supplier = requireNonNull(supplier);
   }
 
   @Override
-  public void authKeyValueConnection(final EndpointContext endpointContext, final ChannelPipeline pipeline) {
-    supplier.get().authKeyValueConnection(endpointContext, pipeline);
-  }
-
-  @Override
-  public void authHttpRequest(final ServiceType serviceType, final HttpRequest request) {
-    supplier.get().authHttpRequest(serviceType, request);
-  }
-
-  @Override
-  public @Nullable CallCredentials protostellarCallCredentials() {
-    return supplier.get().protostellarCallCredentials();
-  }
-
-  @Override
-  public void applyTlsProperties(final SslContextBuilder sslContextBuilder) {
-    supplier.get().applyTlsProperties(sslContextBuilder);
-  }
-
-  @Override
-  public boolean supportsTls() {
-    return supplier.get().supportsTls();
-  }
-
-  @Override
-  public boolean supportsNonTls() {
-    return supplier.get().supportsNonTls();
+  protected Authenticator wrapped() {
+    return supplier.get();
   }
 }

core-io/src/main/java/com/couchbase/client/core/env/AuthenticatorWrapper.java

@@ -28,9 +28,9 @@
 
 @NullMarked
 @Stability.Internal
-abstract class AuthenticatorWrapper implements Authenticator {
+public abstract class AuthenticatorWrapper implements Authenticator {
 
-  abstract Authenticator wrapped();
+  protected abstract Authenticator wrapped();
 
   @Override
   public void authKeyValueConnection(final EndpointContext endpointContext, final ChannelPipeline pipeline) {

core-io/src/main/java/com/couchbase/client/core/env/DelegatingAuthenticator.java

@@ -49,7 +49,7 @@ public void setDelegate(Authenticator delegate) {
     setDelegate(delegate);
   }
 
-  Authenticator wrapped() {
+  protected Authenticator wrapped() {
     return delegate;
   }
 

scala-client/src/main/scala/com/couchbase/client/scala/env/PasswordAuthenticator.scala

@@ -15,40 +15,11 @@
  */
 package com.couchbase.client.scala.env
 
-import com.couchbase.client.core.deps.io.grpc.CallCredentials
-import com.couchbase.client.core.deps.io.netty.channel.ChannelPipeline
-import com.couchbase.client.core.deps.io.netty.handler.codec.http.HttpRequest
-import com.couchbase.client.core.endpoint.EndpointContext
-import com.couchbase.client.core.env.Authenticator
-import com.couchbase.client.core.service.ServiceType
+import com.couchbase.client.core.env.{Authenticator, AuthenticatorWrapper}
 
-case class PasswordAuthenticator(username: String, password: String) extends Authenticator {
+case class PasswordAuthenticator(username: String, password: String) extends AuthenticatorWrapper {
 
   private val inner = com.couchbase.client.core.env.PasswordAuthenticator.create(username, password)
 
-  /** Allows the authenticator to add KV handlers during connection bootstrap to perform
-    * authentication.
-    *
-    * @param endpointContext the endpoint context.
-    * @param pipeline        the pipeline when the endpoint is constructed.
-    */
-  override def authKeyValueConnection(
-      endpointContext: EndpointContext,
-      pipeline: ChannelPipeline
-  ): Unit = {
-    inner.authKeyValueConnection(endpointContext, pipeline)
-  }
-
-  /** Allows to add authentication credentials to the http request for the given service.
-    *
-    * @param serviceType the service for this request.
-    * @param request     the http request.
-    */
-  override def authHttpRequest(serviceType: ServiceType, request: HttpRequest): Unit = {
-    inner.authHttpRequest(serviceType, request)
-  }
-
-  override def protostellarCallCredentials(): CallCredentials = {
-    inner.protostellarCallCredentials()
-  }
+  override protected def wrapped(): Authenticator = inner
 }