[java-shib-shared] branch main updated: Fix warnings and null issues.

[Scott Cantor]

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

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

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=0bdbfce82a4f51dd60456e543291287e2d9b40aa

The following commit(s) were added to refs/heads/main by this push:
     new 0bdbfce8 Fix warnings and null issues.
0bdbfce8 is described below

commit 0bdbfce82a4f51dd60456e543291287e2d9b40aa
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Feb 8 11:28:38 2023 -0500

    Fix warnings and null issues.
---
 .../impl/RandomIdentifierGenerationStrategy.java   | 22 +++++++++++++---------
 .../SecureRandomIdentifierGenerationStrategy.java  |  2 +-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategy.java
index 729590e1..f9c2cd62 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategy.java
@@ -48,7 +48,7 @@ public class RandomIdentifierGenerationStrategy implements IdentifierGenerationS
     private final int sizeOfIdentifier;
 
     /** Encoder used to convert the random bytes in to a string. */
-    @Nonnull final private BinaryEncoder encoder;
+    @Nonnull private final BinaryEncoder encoder;
     
     /**
      * Default constructor.
@@ -69,25 +69,29 @@ public class RandomIdentifierGenerationStrategy implements IdentifierGenerationS
      * 
      * @throws InvalidAlgorithmParameterException if the parameters are invalid
      */
-    public RandomIdentifierGenerationStrategy(@Nonnull ParameterSpec params) throws InvalidAlgorithmParameterException {
+    public RandomIdentifierGenerationStrategy(@Nonnull final ParameterSpec params)
+            throws InvalidAlgorithmParameterException {
         if (params instanceof RandomIdentifierParameterSpec spec) {
-            if (spec.source() != null) {
-                random = spec.source();
+            final RandomGenerator rng = spec.source();
+            if (rng != null) {
+                random = rng;
             } else {
                 random = new SecureRandom();
             }
 
-            if (spec.identifierSize() != null) {
-                if (spec.identifierSize() <= 0) {
+            final Integer size = spec.identifierSize();
+            if (size != null) {
+                if (size <= 0) {
                     throw new InvalidAlgorithmParameterException("Identifier length must be greater than 0");
                 }
-                sizeOfIdentifier = spec.identifierSize();
+                sizeOfIdentifier = size;
             } else {
                 sizeOfIdentifier = 16;
             }
             
-            if (spec.identifierEncoder() != null) {
-                encoder = spec.identifierEncoder();
+            final BinaryEncoder enc = spec.identifierEncoder();
+            if (enc != null) {
+                encoder = enc;
             } else {
                 encoder = new Hex();
             }
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategy.java
index 1f862e59..d74619c8 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategy.java
@@ -51,7 +51,7 @@ public class SecureRandomIdentifierGenerationStrategy extends RandomIdentifierGe
      * 
      * @throws InvalidAlgorithmParameterException if the parameters are invalid
      */
-    public SecureRandomIdentifierGenerationStrategy(@Nonnull ParameterSpec params)
+    public SecureRandomIdentifierGenerationStrategy(@Nonnull final ParameterSpec params)
             throws InvalidAlgorithmParameterException {
         super(params);
         

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