[java-opensaml] branch main updated: Add non-null security configuration methods.

[Scott Cantor]

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

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

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=7ea6dcbd295a5858c90c687c1af49f41580a2f78

The following commit(s) were added to refs/heads/main by this push:
     new 7ea6dcbd2 Add non-null security configuration methods.
7ea6dcbd2 is described below

commit 7ea6dcbd295a5858c90c687c1af49f41580a2f78
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Apr 20 11:00:37 2023 -0400

    Add non-null security configuration methods.
---
 .../InlineSelfEncryptionParametersStrategy.java    |  2 +-
 .../xmlsec/SecurityConfigurationSupport.java       | 67 ++++++++++++++++++----
 2 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategy.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategy.java
index 1dbdb9f82..38cae99f6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategy.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategy.java
@@ -185,7 +185,7 @@ public class InlineSelfEncryptionParametersStrategy
             return baseConfigs;
         }
         log.debug("No self-encryption EncryptionConfigurations were resolved, returning global configuration");
-        return CollectionSupport.singletonList(SecurityConfigurationSupport.getGlobalEncryptionConfiguration());
+        return CollectionSupport.singletonList(SecurityConfigurationSupport.ensureGlobalEncryptionConfiguration());
     }
     
 }
\ No newline at end of file
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/SecurityConfigurationSupport.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/SecurityConfigurationSupport.java
index 162f968c1..a24357ef8 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/SecurityConfigurationSupport.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/SecurityConfigurationSupport.java
@@ -17,6 +17,9 @@
 
 package org.opensaml.xmlsec;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import org.opensaml.core.config.ConfigurationService;
 
 /**
@@ -28,39 +31,83 @@ public final class SecurityConfigurationSupport {
     private SecurityConfigurationSupport() { }
     
     /**
-     * Get the global {@link DecryptionConfiguration}  instance.
+     * Get the global {@link DecryptionConfiguration} instance.
      * 
      * @return the global decryption configuration
      */
-    public static DecryptionConfiguration getGlobalDecryptionConfiguration() {
+    @Nullable public static DecryptionConfiguration getGlobalDecryptionConfiguration() {
         return ConfigurationService.get(DecryptionConfiguration.class);
     }
 
     /**
-     * Get the global {@link EncryptionConfiguration}  instance.
+     * Get the global {@link DecryptionConfiguration} instance, raising an exception if absent.
+     * 
+     * @return the global decryption configuration
+     * 
+     * @since 5.0.0
+     */
+    @Nonnull public static DecryptionConfiguration ensureGlobalDecryptionConfiguration() {
+        return ConfigurationService.ensure(DecryptionConfiguration.class);
+    }
+    
+    /**
+     * Get the global {@link EncryptionConfiguration} instance.
      * 
      * @return the global encryption configuration
      */
-    public static EncryptionConfiguration getGlobalEncryptionConfiguration() {
+    @Nullable public static EncryptionConfiguration getGlobalEncryptionConfiguration() {
         return ConfigurationService.get(EncryptionConfiguration.class);
     }
     
     /**
-     * Get the global {@link SignatureSigningConfiguration }  instance.
+     * Get the global {@link EncryptionConfiguration} instance, raising an exception if absent.
+     * 
+     * @return the global encryption configuration
+     * 
+     * @since 5.0.0
+     */
+    @Nonnull public static EncryptionConfiguration ensureGlobalEncryptionConfiguration() {
+        return ConfigurationService.ensure(EncryptionConfiguration.class);
+    }
+    
+    /**
+     * Get the global {@link SignatureSigningConfiguration} instance.
      * 
      * @return the global signature signing configuration
      */
-    public static SignatureSigningConfiguration getGlobalSignatureSigningConfiguration() {
+    @Nullable public static SignatureSigningConfiguration getGlobalSignatureSigningConfiguration() {
         return ConfigurationService.get(SignatureSigningConfiguration.class);
     }
-    
+
+    /**
+     * Get the global {@link SignatureSigningConfiguration} instance, raising an exception if absent.
+     * 
+     * @return the global signature signing configuration
+     * 
+     * @since 5.0.0
+     */
+    @Nonnull public static SignatureSigningConfiguration ensureGlobalSignatureSigningConfiguration() {
+        return ConfigurationService.ensure(SignatureSigningConfiguration.class);
+    }
+
     /**
-     * Get the global {@link SignatureValidationConfiguration}  instance.
+     * Get the global {@link SignatureValidationConfiguration} instance.
      * 
      * @return the global signature validation configuration
      */
-    public static SignatureValidationConfiguration getGlobalSignatureValidationConfiguration() {
+    @Nullable public static SignatureValidationConfiguration getGlobalSignatureValidationConfiguration() {
         return ConfigurationService.get(SignatureValidationConfiguration.class);
     }
     
-}
+    /**
+     * Get the global {@link SignatureValidationConfiguration} instance, raising an exception if absent.
+     * 
+     * @return the global signature validation configuration
+     * 
+     * @since 5.0.0
+     */
+    @Nonnull public static SignatureValidationConfiguration ensureGlobalSignatureValidationConfiguration() {
+        return ConfigurationService.ensure(SignatureValidationConfiguration.class);
+    }
+
+}
\ No newline at end of file

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