[java-identity-provider] branch main updated: Streamline property syntax for module IDs.

[Scott Cantor]

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

scantor 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=beecb494fb370e56fcc09535ccba07d8ffbc3393

The following commit(s) were added to refs/heads/main by this push:
       new  beecb494f Streamline property syntax for module IDs.
beecb494f is described below

commit beecb494fb370e56fcc09535ccba07d8ffbc3393
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Sep 11 12:32:51 2020 -0400

    Streamline property syntax for module IDs.
---
 .../net/shibboleth/idp/module/PropertyDrivenIdPModule.java     |  5 +----
 .../net/shibboleth/idp/module/authn/impl/module.properties     | 10 +++++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/idp-admin-api/src/main/java/net/shibboleth/idp/module/PropertyDrivenIdPModule.java b/idp-admin-api/src/main/java/net/shibboleth/idp/module/PropertyDrivenIdPModule.java
index 5cbb7e463..054f18429 100644
--- a/idp-admin-api/src/main/java/net/shibboleth/idp/module/PropertyDrivenIdPModule.java
+++ b/idp-admin-api/src/main/java/net/shibboleth/idp/module/PropertyDrivenIdPModule.java
@@ -49,9 +49,6 @@ public class PropertyDrivenIdPModule extends AbstractIdPModule {
     /** Default name of module properties resource. */
     @Nonnull @NotEmpty public static final String DEFAULT_RESOURCE = "module.properties";
 
-    /** Suffix of property for module ID. */
-    @Nonnull @NotEmpty public static final String MODULE_ID_PROPERTY = ".id";
-
     /** Suffix of property for module name. */
     @Nonnull @NotEmpty public static final String MODULE_NAME_PROPERTY = ".name";
 
@@ -137,7 +134,7 @@ public class PropertyDrivenIdPModule extends AbstractIdPModule {
     protected void load() throws ModuleException {
         try {
             moduleId = Constraint.isNotNull(
-                    StringSupport.trimOrNull(moduleProperties.getProperty(getClass().getName() + MODULE_ID_PROPERTY)),
+                    StringSupport.trimOrNull(moduleProperties.getProperty(getClass().getName())),
                     "Module ID missing from properties");
             
             moduleName = Constraint.isNotNull(
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/authn/impl/module.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/authn/impl/module.properties
index 9195bd69c..79446c048 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/authn/impl/module.properties
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/authn/impl/module.properties
@@ -1,11 +1,11 @@
 # Properties defining authn modules
 
 # Class to Module ID mappings
-net.shibboleth.idp.module.authn.impl.Function.id = idp.authn.Function
-net.shibboleth.idp.module.authn.impl.IPAddress.id = idp.authn.IPAddress
-net.shibboleth.idp.module.authn.impl.RemoteUserInternal.id = idp.authn.RemoteUserInternal
-net.shibboleth.idp.module.authn.impl.X509.id = idp.authn.X509
-net.shibboleth.idp.module.authn.impl.X509Internal.id = idp.authn.X509Internal
+net.shibboleth.idp.module.authn.impl.Function = idp.authn.Function
+net.shibboleth.idp.module.authn.impl.IPAddress = idp.authn.IPAddress
+net.shibboleth.idp.module.authn.impl.RemoteUserInternal = idp.authn.RemoteUserInternal
+net.shibboleth.idp.module.authn.impl.X509 = idp.authn.X509
+net.shibboleth.idp.module.authn.impl.X509Internal = idp.authn.X509Internal
 
 idp.authn.Function.name = Function Authentication
 idp.authn.Function.desc = Login flow that produces a result from a function.

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