diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/DefaultAuthenticatorFactory.java b/jetty-security/src/main/java/org/eclipse/jetty/security/DefaultAuthenticatorFactory.java
index 6bcbc7b10d98..722599c47d16 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/DefaultAuthenticatorFactory.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/DefaultAuthenticatorFactory.java
@@ -36,7 +36,7 @@
*
{@link org.eclipse.jetty.security.authentication.DigestAuthenticator}
* {@link org.eclipse.jetty.security.authentication.FormAuthenticator}
* {@link org.eclipse.jetty.security.authentication.ClientCertAuthenticator}
- * {@link SslClientCertAuthenticator}
+ * {@link org.eclipse.jetty.security.authentication.SslClientCertAuthenticator}
*
* All authenticators derived from {@link org.eclipse.jetty.security.authentication.LoginAuthenticator} are
* wrapped with a {@link org.eclipse.jetty.security.authentication.DeferredAuthentication}
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/ClientCertAuthenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/ClientCertAuthenticator.java
index c3fc25f14f82..996551d7f368 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/ClientCertAuthenticator.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/ClientCertAuthenticator.java
@@ -35,10 +35,10 @@
import org.eclipse.jetty.util.security.Constraint;
import org.eclipse.jetty.util.security.Password;
-@Deprecated
/**
* @deprecated Prefer using {@link SslClientCertAuthenticator}
*/
+@Deprecated
public class ClientCertAuthenticator extends LoginAuthenticator
{
/**
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SslClientCertAuthenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SslClientCertAuthenticator.java
index d578e27d7e25..57efa23f7e7a 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SslClientCertAuthenticator.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SslClientCertAuthenticator.java
@@ -37,23 +37,14 @@
* The client certificates available in the request will be verified against the configured {@link SslContextFactory} instance
*
*/
-public class SslClientCertAuthenticator
- extends LoginAuthenticator
+public class SslClientCertAuthenticator extends LoginAuthenticator
{
-
- /**
- * Set to true if SSL certificate validation is not required
- * per default it's true as this is the goal of this implementation
- */
+ private final SslContextFactory sslContextFactory;
private boolean validateCerts = true;
- private SslContextFactory sslContextFactory;
-
public SslClientCertAuthenticator(SslContextFactory sslContextFactory)
{
- super();
- Objects.nonNull(sslContextFactory);
- this.sslContextFactory = sslContextFactory;
+ this.sslContextFactory = Objects.requireNonNull(sslContextFactory);
}
@Override
@@ -135,7 +126,7 @@ public boolean secureResponse(ServletRequest req, ServletResponse res, boolean m
}
/**
- * @return true if SSL certificate has to be validated
+ * @return true if SSL certificate has to be validated.
*/
public boolean isValidateCerts()
{
@@ -143,11 +134,10 @@ public boolean isValidateCerts()
}
/**
- * @param validateCerts true if SSL certificates have to be validated
+ * @param validateCerts true if SSL certificates have to be validated.
*/
public void setValidateCerts(boolean validateCerts)
{
- validateCerts = validateCerts;
+ this.validateCerts = validateCerts;
}
-
}