[java-shib-attribute] branch main updated: Fix some warnings.

[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-attribute.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=44d9209fcf65852bb038d370963f68ad5aa2b6c8

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

commit 44d9209fcf65852bb038d370963f68ad5aa2b6c8
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Mar 3 09:10:04 2023 -0500

    Fix some warnings.
---
 .../net/shibboleth/idp/attribute/impl/ComputedPairwiseIdStore.java   | 5 ++---
 .../java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStore.java  | 5 +++--
 .../attribute/transcoding/impl/AttributeTranscoderRegistryImpl.java  | 1 -
 .../idp/attribute/transcoding/impl/TranscodingRuleLoader.java        | 1 +
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/ComputedPairwiseIdStore.java b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/ComputedPairwiseIdStore.java
index 4db815c32..d852e5fcb 100644
--- a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/ComputedPairwiseIdStore.java
+++ b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/ComputedPairwiseIdStore.java
@@ -20,7 +20,6 @@ package net.shibboleth.idp.attribute.impl;
 import java.io.IOException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.BiFunction;
@@ -282,10 +281,10 @@ public class ComputedPairwiseIdStore extends AbstractInitializableComponent impl
         Constraint.isNotNull(pid, "Input PairwiseId object cannot be null");
         final String recipientId =
                 Constraint.isNotEmpty(pid.getRecipientEntityID(), "Recipient entityID cannot be null or empty");
-        final String principalName =
-                Constraint.isNotEmpty(pid.getPrincipalName(), "Principal name cannot be null or empty");
         final String sourceId =
                 Constraint.isNotEmpty(pid.getSourceSystemId(), "Source system ID cannot be null or empty");
+        // Check this on behalf of salt determination.
+        Constraint.isNotEmpty(pid.getPrincipalName(), "Principal name cannot be null or empty");
     
         final byte[] effectiveSalt = getEffectiveSalt(pid);
         if (effectiveSalt == null) {
diff --git a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStore.java b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStore.java
index b4ffcf3d4..bb73adc70 100644
--- a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStore.java
+++ b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStore.java
@@ -50,6 +50,7 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.collection.CollectionSupport;
 import net.shibboleth.shared.component.AbstractInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.logic.Constraint;
@@ -156,7 +157,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
     /** Constructor. */
     public JDBCPairwiseIdStore() {
         transactionRetry = 3;
-        retryableErrors = List.of("23000", "23505");
+        retryableErrors = CollectionSupport.listOf("23000", "23505");
         queryTimeout = Duration.ofSeconds(5);
         verifyDatabase = true;
         
@@ -283,7 +284,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
     public void setRetryableErrors(@Nullable @NonnullElements final Collection<String> errors) {
         checkSetterPreconditions();
         
-        retryableErrors = List.copyOf(StringSupport.normalizeStringCollection(errors));
+        retryableErrors = CollectionSupport.copyToList(StringSupport.normalizeStringCollection(errors));
     }
     
     /**
diff --git a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImpl.java b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImpl.java
index e54676673..696fb9d0f 100644
--- a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImpl.java
+++ b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImpl.java
@@ -19,7 +19,6 @@ package net.shibboleth.idp.attribute.transcoding.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
diff --git a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/TranscodingRuleLoader.java b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/TranscodingRuleLoader.java
index 3c59c79e4..f0642b8f2 100644
--- a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/TranscodingRuleLoader.java
+++ b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/TranscodingRuleLoader.java
@@ -130,6 +130,7 @@ public class TranscodingRuleLoader {
         rules = maps
                 .stream()
                 .map(m -> {
+                    assert m!= null;
                     return new TranscodingRule(m);
                     })
                 .collect(CollectionSupport.nonnullCollector(Collectors.toList()))

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