[java-identity-provider] 01/04: IDP-2069 Null Handling

[Rod Widdowson]

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

rdw 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=22c869f5239ed40c4ad3c52afd65b831a073d3db

commit 22c869f5239ed40c4ad3c52afd65b831a073d3db
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Mar 13 16:44:42 2023 +0000

    IDP-2069 Null Handling
    
    https://shibboleth.atlassian.net/browse/IDP-2069
    
    Remove all warnings from idp-admin-impl
---
 .../impl/InitializeAdministrativeProfileContextTree.java  |  1 +
 .../java/net/shibboleth/idp/admin/impl/OutputMetrics.java | 15 +++++++++++----
 .../shibboleth/idp/plugin/impl/FirstPartyIdPPlugin.java   |  3 ++-
 .../shibboleth/idp/admin/impl/DoStorageOperationTest.java |  7 ++++++-
 .../InitializeAdministrativeProfileContextTreeTest.java   |  1 +
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTree.java b/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTree.java
index ac4603b57..ca092aa6f 100644
--- a/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTree.java
+++ b/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTree.java
@@ -77,6 +77,7 @@ public class InitializeAdministrativeProfileContextTree extends AbstractProfileA
      * 
      * @param langs a semi-colon separated string.
      */
+    @SuppressWarnings("unused")
     public void setFallbackLanguages(@Nonnull @NonnullElements final List<String> langs) {
         checkSetterPreconditions();
         
diff --git a/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/OutputMetrics.java b/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/OutputMetrics.java
index becf58fb3..6787e2ca1 100644
--- a/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/OutputMetrics.java
+++ b/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/OutputMetrics.java
@@ -107,7 +107,9 @@ public class OutputMetrics extends AbstractProfileAction {
     /** Constructor. */
     public OutputMetrics() {
         metricFilterMap = CollectionSupport.emptyMap();
-        dateTimeFormatter = DateTimeFormatter.ISO_INSTANT;
+        final DateTimeFormatter instant = DateTimeFormatter.ISO_INSTANT;
+        assert instant!=null;
+        dateTimeFormatter = instant;
     }
 
     /**
@@ -163,7 +165,9 @@ public class OutputMetrics extends AbstractProfileAction {
         checkSetterPreconditions();
         
         if (format != null) {
-            dateTimeFormatter = DateTimeFormatter.ofPattern(StringSupport.trimOrNull(format));
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern(StringSupport.trimOrNull(format));
+            assert formatter!=null;
+            dateTimeFormatter = formatter;
         }
     }
     
@@ -207,11 +211,14 @@ public class OutputMetrics extends AbstractProfileAction {
             throw new ComponentInitializationException("MetricRegistry cannot be null");
         }
         
+        final DateTimeFormatter formatter;
         if (useDefaultTimeZone) {
-            dateTimeFormatter = dateTimeFormatter.withZone(ZoneId.systemDefault());
+            formatter = dateTimeFormatter.withZone(ZoneId.systemDefault());
         } else {
-            dateTimeFormatter = dateTimeFormatter.withZone(ZoneOffset.UTC);
+            formatter = dateTimeFormatter.withZone(ZoneOffset.UTC);
         }
+        assert formatter!= null;
+        dateTimeFormatter = formatter;
     }
 
     /** {@inheritDoc} */
diff --git a/idp-admin-impl/src/main/java/net/shibboleth/idp/plugin/impl/FirstPartyIdPPlugin.java b/idp-admin-impl/src/main/java/net/shibboleth/idp/plugin/impl/FirstPartyIdPPlugin.java
index c4c1871fb..ec1443a70 100644
--- a/idp-admin-impl/src/main/java/net/shibboleth/idp/plugin/impl/FirstPartyIdPPlugin.java
+++ b/idp-admin-impl/src/main/java/net/shibboleth/idp/plugin/impl/FirstPartyIdPPlugin.java
@@ -30,6 +30,7 @@ import net.shibboleth.idp.plugin.PropertyDrivenIdPPlugin;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.collection.CollectionSupport;
 
 /**
  * Implementation class for plugins from the project itself to centralize
@@ -55,7 +56,7 @@ public class FirstPartyIdPPlugin extends PropertyDrivenIdPPlugin {
     @Nonnull @NonnullElements @Unmodifiable @NotLive public List<URL> getDefaultUpdateURLs() throws PluginException {
         try {
             // The second location is a backup CNAME pointing into AWS S3 at present.
-            return List.of(
+            return CollectionSupport.listOf(
                     new URL("https://shibboleth.net/downloads/identity-provider/plugins/plugins.properties"),
                     new URL("http://plugins.shibboleth.net/plugins.properties"));
         } catch (final MalformedURLException e) {
diff --git a/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/DoStorageOperationTest.java b/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/DoStorageOperationTest.java
index e1e1fea54..5e625119e 100644
--- a/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/DoStorageOperationTest.java
+++ b/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/DoStorageOperationTest.java
@@ -83,16 +83,21 @@ public class DoStorageOperationTest {
 
         storageService = new MemoryStorageService();
         storageService.setId("test");
-        storageService.setCleanupInterval(Duration.ZERO);
+        final Duration zeroDuration = Duration.ZERO;
+        assert zeroDuration!=null;
+        storageService.setCleanupInterval(zeroDuration);
         storageService.initialize();
         
         mapper = new ObjectMapper();
         mapper.setSerializationInclusion(Include.NON_NULL);
         
         action = new DoStorageOperation();
+        assert request != null;
         action.setHttpServletRequestSupplier(new ConstantSupplier<>(request));
+        assert response != null;
         action.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
         action.setStorageService(storageService);
+        assert mapper != null;
         action.setObjectMapper(mapper);
         action.initialize();
     }
diff --git a/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTreeTest.java b/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTreeTest.java
index 42cb7157c..b3ac98008 100644
--- a/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTreeTest.java
+++ b/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTreeTest.java
@@ -69,6 +69,7 @@ public class InitializeAdministrativeProfileContextTreeTest extends OpenSAMLInit
         action = new InitializeAdministrativeProfileContextTree();
         action.setAdministrativeFlowDescriptor(descriptor);
         action.setHttpServletRequestSupplier(new NonnullSupplier<> () {
+            @SuppressWarnings("null")
             @Nonnull public HttpServletRequest get() {
                 return (HttpServletRequest) src.getExternalContext().getNativeRequest();
             }

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