[java-identity-provider] branch main updated: JSPROF-14 Tolerate gaps in resource-related module properties

[Codeberg]

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

codeberg pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
https://codeberg.org/Shibboleth/java-identity-provider/commit/ed726a70a62f0fa2e93c28a2943d06092053917f

The following commit(s) were added to refs/heads/main by this push:
     new ed726a70a JSPROF-14 Tolerate gaps in resource-related module properties
ed726a70a is described below

commit ed726a70a62f0fa2e93c28a2943d06092053917f
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Sep 18 13:20:20 2026 +0100

    JSPROF-14 Tolerate gaps in resource-related module properties
    
    https://shibboleth.atlassian.net/browse/JSPROF-14
    
    Recast the handling of -L/--list-available to use (new) support
    function to get the names of plugins described in plugins.properties
---
 .../idp/installer/plugin/impl/PluginInstallerCLI.java    | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
index ee2531a36..744a2aef2 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
@@ -23,7 +23,6 @@ import java.net.URL;
 import java.nio.file.Path;
 import java.security.Security;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -466,16 +465,11 @@ public final class PluginInstallerCLI extends AbstractIdPHomeAwareCommandLine<Pl
         }
 
         final Map<String, InstallableComponentInfo> plugins = new HashMap<>();
-        final Enumeration<Object> en = props.keys();
-        while (en.hasMoreElements()) {
-            final String key = (String)en.nextElement();
-            if (key.endsWith(InstallableComponentSupport.AVAILABLE_VERSIONS_PROPERTY_SUFFIX)) {
-                final String pluginId = key.substring(0, key.length()-9);
-                assert pluginId != null;
-                final InstallableComponentInfo info = new PluginInfo(pluginId, props);
-                if (info.isInfoComplete()) {
-                    plugins.put(pluginId, info);
-                }
+        for (final String pluginId: InstallableComponentSupport.getAllComponents(props)) {
+            assert pluginId != null;
+            final InstallableComponentInfo info = new PluginInfo(pluginId, props);
+            if (info.isInfoComplete()) {
+                plugins.put(pluginId, info);
             }
         }
 

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