[java-shib-attribute] 03/05: IDP-2069 Null handling task

[Rod Widdowson]

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

rdw 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=503e6874dcad8146621a217c9614d9d0da15aec7

commit 503e6874dcad8146621a217c9614d9d0da15aec7
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon May 1 15:25:52 2023 +0100

    IDP-2069 Null handling task
    
    https://shibboleth.atlassian.net/browse/IDP-2069
    
    Fix the easier-to-fix warnings in shib-attribute-impl
---
 .../idp/attribute/impl/JDBCPairwiseIdStore.java         | 17 ++++++++++++-----
 .../impl/AttributeTranscoderRegistryImpl.java           | 16 ++++++++++------
 2 files changed, 22 insertions(+), 11 deletions(-)

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 bb73adc70..4de6117b8 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
@@ -158,7 +158,9 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
     public JDBCPairwiseIdStore() {
         transactionRetry = 3;
         retryableErrors = CollectionSupport.listOf("23000", "23505");
-        queryTimeout = Duration.ofSeconds(5);
+        final Duration fiveSecs = Duration.ofSeconds(5);
+        assert fiveSecs!=null;
+        queryTimeout = fiveSecs;
         verifyDatabase = true;
         
         tableName = "shibpid";
@@ -617,7 +619,9 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
                 statement.setString(6, pid.getSourceSystemId());
         
                 log.debug("Getting active and/or last inactive pairwise ID entry");
-                final List<PairwiseId> entries = buildIdentifierEntries(statement.executeQuery());
+                final ResultSet resultSet =  statement.executeQuery();
+                assert resultSet!=null;
+                final List<PairwiseId> entries = buildIdentifierEntries(resultSet);
                 final Instant deactivationTime;
                 if (entries != null && entries.size() > 0 && ((deactivationTime = entries.get(0).getDeactivationTime()) == null
                         || deactivationTime.isAfter(Instant.now()))) {
@@ -697,8 +701,9 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
             statement.setString(1, pid.getIssuerEntityID());
             statement.setString(2, pid.getRecipientEntityID());
             statement.setString(3, pid.getPairwiseId());
-    
-            final List<PairwiseId> entries = buildIdentifierEntries(statement.executeQuery());
+            final ResultSet resultSet =  statement.executeQuery();
+            assert resultSet!=null;
+            final List<PairwiseId> entries = buildIdentifierEntries(resultSet);
     
             if (entries == null || entries.size() == 0) {
                 return null;
@@ -953,7 +958,9 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
          * @throws SQLException if the underlying JDBC driver throws one 
          */
         public ConnectionWithLock(final boolean autoCommit, final boolean writeLock) throws SQLException {
-            connection = dataSource.getConnection();
+            final Connection conn = dataSource.getConnection();
+            assert conn != null;
+            connection = conn;
             connection.setAutoCommit(autoCommit);
             connection.setTransactionIsolation(transactionIsolation);
             if (readWriteLock != null) {
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 1bad2a88c..18624c7d1 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
@@ -161,7 +161,8 @@ public class AttributeTranscoderRegistryImpl extends AbstractIdentifiableInitial
                 }
                 
                 final Collection<AttributeTranscoder<?>> transcoders = getAttributeTranscoders(mapping);
-                for (@Nonnull final AttributeTranscoder<?> transcoder : transcoders) {
+                for (final AttributeTranscoder<?> transcoder : transcoders) {
+                    assert transcoder!=null;
                     addMapping(internalId, transcoder, mapping.getMap());
                 }
             } else {
@@ -191,8 +192,9 @@ public class AttributeTranscoderRegistryImpl extends AbstractIdentifiableInitial
         checkComponentActive();
         Constraint.isNotNull(attribute, "IdPAttribute cannot be null");
      
-        if (displayNameRegistry.containsKey(attribute.getId())) {
-            return displayNameRegistry.get(attribute.getId());
+        final Map<Locale, String> map = displayNameRegistry.get(attribute.getId()); 
+        if (map!=null) {
+            return map;
         }
         return CollectionSupport.emptyMap();
     }
@@ -203,8 +205,9 @@ public class AttributeTranscoderRegistryImpl extends AbstractIdentifiableInitial
         checkComponentActive();
         Constraint.isNotNull(attribute, "IdPAttribute cannot be null");
         
-        if (descriptionRegistry.containsKey(attribute.getId())) {
-            return descriptionRegistry.get(attribute.getId());
+        final Map<Locale, String> map = descriptionRegistry.get(attribute.getId()); 
+        if (map!=null) {
+            return map;
         }
         return CollectionSupport.emptyMap();
     }
@@ -286,7 +289,8 @@ public class AttributeTranscoderRegistryImpl extends AbstractIdentifiableInitial
         
         final ApplicationContext appContext = getApplicationContext();
         if (appContext != null) {
-            for (@Nonnull final String id : StringSupport.stringToList(beanNames, " ")) {
+            for (final String id : StringSupport.stringToList(beanNames, " ")) {
+                assert id!=null;
                 try {
                     transcoder = appContext.getBean(id, AttributeTranscoder.class);
                     transcoder.initialize();

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