[java-identity-provider] branch main updated: Fix some nits.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=29384f1260c42a8333be67d6b6358e0bc8f6fac3

The following commit(s) were added to refs/heads/main by this push:
     new 29384f126 Fix some nits.
29384f126 is described below

commit 29384f1260c42a8333be67d6b6358e0bc8f6fac3
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jun 13 16:23:42 2023 -0400

    Fix some nits.
---
 .../shibboleth/idp/admin/impl/UnlockDataSealers.java  |  3 ++-
 .../authn/impl/KeystoreResourceCredentialConfig.java  | 19 ++++++++++---------
 .../idp/authn/impl/X509ResourceCredentialConfig.java  |  9 +++++----
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/UnlockDataSealers.java b/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/UnlockDataSealers.java
index b1645a50b..d2317f9ee 100644
--- a/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/UnlockDataSealers.java
+++ b/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/UnlockDataSealers.java
@@ -105,7 +105,8 @@ public class UnlockDataSealers extends AbstractProfileAction {
     /** {@inheritDoc} */
     @Override protected void doExecute(final @Nonnull ProfileRequestContext profileRequestContext) {
 
-        @Nonnull final HttpServletRequest request = Constraint.isNotNull(getHttpServletRequest(), "Could noit locate servlet request");
+        @Nonnull final HttpServletRequest request =
+                Constraint.isNotNull(getHttpServletRequest(), "Could not locate servlet request");
         
         final String[] keystorePasswords = request.getParameterValues(KEYSTORE_PASSWORD_PARAM_NAME);
         final String[] keyPasswords = request.getParameterValues(KEY_PASSWORD_PARAM_NAME);
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/KeystoreResourceCredentialConfig.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/KeystoreResourceCredentialConfig.java
index 7317b1727..f522212fc 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/KeystoreResourceCredentialConfig.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/KeystoreResourceCredentialConfig.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.security.GeneralSecurityException;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.logic.Constraint;
@@ -38,31 +39,31 @@ import org.ldaptive.ssl.SSLContextInitializer;
 public class KeystoreResourceCredentialConfig implements CredentialConfig {
 
     /** Handles loading keystores. */
-    private final KeyStoreCredentialReader keyStoreReader = new KeyStoreCredentialReader();
+    @Nonnull private final KeyStoreCredentialReader keyStoreReader = new KeyStoreCredentialReader();
 
     /** Truststore resource. */
-    private Resource truststore;
+    @Nullable private Resource truststore;
 
     /** Password for truststore. */
-    private String truststorePassword;
+    @Nullable private String truststorePassword;
 
     /** Type of truststore. */
-    private String truststoreType;
+    @Nullable private String truststoreType;
 
     /** Truststore aliases to use. */
-    private String[] truststoreAliases;
+    @Nullable private String[] truststoreAliases;
 
     /** Keystore resource. */
-    private Resource keystore;
+    @Nullable private Resource keystore;
 
     /** Password for keystore. */
-    private String keystorePassword;
+    @Nullable private String keystorePassword;
 
     /** Type of keystore. */
-    private String keystoreType;
+    @Nullable private String keystoreType;
 
     /** Keystore aliases to use. */
-    private String[] keystoreAliases;
+    @Nullable private String[] keystoreAliases;
 
     /**
      * Set the truststore resource.
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X509ResourceCredentialConfig.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X509ResourceCredentialConfig.java
index 1a1ff8d39..08a7bb686 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X509ResourceCredentialConfig.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X509ResourceCredentialConfig.java
@@ -22,6 +22,7 @@ import java.security.GeneralSecurityException;
 import java.security.cert.X509Certificate;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.logic.Constraint;
@@ -39,16 +40,16 @@ import org.opensaml.security.x509.X509Support;
 public class X509ResourceCredentialConfig implements CredentialConfig {
 
     /** Name of the trust certificates to use for the SSL connection. */
-    private Resource trustCertificates;
+    @Nullable private Resource trustCertificates;
 
     /** Name of the authentication certificate to use for the SSL connection. */
-    private Resource authenticationCertificate;
+    @Nullable private Resource authenticationCertificate;
 
     /** Name of the key to use for the SSL connection. */
-    private Resource authenticationKey;
+    @Nullable private Resource authenticationKey;
 
     /** Password to decrypt the authentication key. */
-    private String authenticationKeyPassword;
+    @Nullable private String authenticationKeyPassword;
 
     /**
      * Set the trust certificates resource.

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.