Gardening: Authenticator.requiresTls()

Modifications
-------------
Merge supportsTls() and supportsNonTls() into
a single method: requiresTls()

Having two methods was fussy, and we're unlikely to add
an authenticator that strictly requires the _absence_ of TLS.

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

Author: dnault

core-io/src/main/java/com/couchbase/client/core/Core.java

@@ -282,9 +282,7 @@ protected Core(
     final Authenticator authenticator,
     final ConnectionString connectionString
   ) {
-    if (environment.securityConfig().tlsEnabled() && !authenticator.supportsTls()) {
-      throw new InvalidArgumentException("TLS enabled but the Authenticator does not support TLS!", null, null);
-    } else if (!environment.securityConfig().tlsEnabled() && !authenticator.supportsNonTls()) {
+    if (authenticator.requiresTls() && !environment.securityConfig().tlsEnabled()) {
       throw new InvalidArgumentException("TLS not enabled but the Authenticator requires TLS!", null, null);
     }
 

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

@@ -70,16 +70,9 @@ default void authHttpRequest(final ServiceType serviceType, final HttpRequest re
   @Stability.Internal
   default void applyTlsProperties(final SslContextBuilder sslContextBuilder) { }
 
-  /**
-   * If this authenticator supports encrypted connections.
-   */
-  @Stability.Internal
-  default boolean supportsTls() { return true; }
-
-  /**
-   * If this authenticator supports non-encrypted connections.
-   */
   @Stability.Internal
-  default boolean supportsNonTls() { return true; }
+  default boolean requiresTls() {
+    return true;
+  }
 
 }

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

@@ -53,12 +53,7 @@ public void applyTlsProperties(final SslContextBuilder sslContextBuilder) {
   }
 
   @Override
-  public boolean supportsTls() {
-    return wrapped().supportsTls();
-  }
-
-  @Override
-  public boolean supportsNonTls() {
-    return wrapped().supportsNonTls();
+  public boolean requiresTls() {
+    return wrapped().requiresTls();
   }
 }

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

@@ -151,11 +151,6 @@ public void applyTlsProperties(final SslContextBuilder context) {
     }
   }
 
-  @Override
-  public boolean supportsNonTls() {
-    return false;
-  }
-
   @Override
   public String toString() {
     // Intentionally omit sensitive info like private key.

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

@@ -200,6 +200,11 @@ public void thisUsesUnstableApi() {
     };
   }
 
+  @Override
+  public boolean requiresTls() {
+    return false;
+  }
+
   /**
    * Provides customization to the {@link PasswordAuthenticator}.
    */

core-io/src/main/java/com/couchbase/client/core/protostellar/ProtostellarContext.java

@@ -42,9 +42,7 @@ public ProtostellarContext(final CoreEnvironment env, final Authenticator authen
     this.authenticator = requireNonNull(authenticator);
     this.coreResources = requireNonNull(coreResources);
 
-    if (env.securityConfig().tlsEnabled() && !authenticator.supportsTls()) {
-      throw InvalidArgumentException.fromMessage("TLS enabled but the Authenticator does not support TLS!");
-    } else if (!env.securityConfig().tlsEnabled() && !authenticator.supportsNonTls()) {
+    if (authenticator.requiresTls() && !env.securityConfig().tlsEnabled()) {
       throw InvalidArgumentException.fromMessage("TLS not enabled but the Authenticator requires TLS!");
     }
   }