[java-identity-provider] 03/51: Relax requirement for version string in new APIs.
Rod Widdowson
rdw at steadingsoftware.com
Sat Mar 16 14:28:35 UTC 2024
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch dev/IDP-2147
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=472a07b18c29c755b2fcfa43cfc5e25e0d855a2e
commit 472a07b18c29c755b2fcfa43cfc5e25e0d855a2e
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 6 13:21:47 2024 -0500
Relax requirement for version string in new APIs.
---
.../java/net/shibboleth/idp/module/PropertyDrivenIdPModule.java | 7 ++++---
.../main/java/net/shibboleth/idp/module/impl/PluginIdPModule.java | 5 ++++-
2 files changed, 8 insertions(+), 4 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 50d349622..5829e82d9 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
@@ -19,6 +19,7 @@ import java.io.InputStream;
import java.util.Properties;
import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import net.shibboleth.idp.Version;
import net.shibboleth.profile.module.ModuleException;
@@ -80,7 +81,7 @@ public class PropertyDrivenIdPModule extends PropertyDrivenModule implements IdP
*
* @since 5.1.0
*/
- protected PropertyDrivenIdPModule(@Nonnull final String version, @Nonnull final Class<? extends IdPModule> claz)
+ protected PropertyDrivenIdPModule(@Nullable final String version, @Nonnull final Class<? extends IdPModule> claz)
throws IOException, ModuleException {
this(version, claz.getResourceAsStream(DEFAULT_RESOURCE));
}
@@ -96,7 +97,7 @@ public class PropertyDrivenIdPModule extends PropertyDrivenModule implements IdP
*
* @since 5.1.0
*/
- protected PropertyDrivenIdPModule(@Nonnull final String version, @Nonnull final InputStream inputStream)
+ protected PropertyDrivenIdPModule(@Nullable final String version, @Nonnull final InputStream inputStream)
throws IOException, ModuleException {
super(version, inputStream);
}
@@ -111,7 +112,7 @@ public class PropertyDrivenIdPModule extends PropertyDrivenModule implements IdP
*
* @since 5.1.0
*/
- protected PropertyDrivenIdPModule(@Nonnull final String version, @Nonnull final Properties properties)
+ protected PropertyDrivenIdPModule(@Nullable final String version, @Nonnull final Properties properties)
throws ModuleException {
super(version, properties);
}
diff --git a/idp-admin-impl/src/main/java/net/shibboleth/idp/module/impl/PluginIdPModule.java b/idp-admin-impl/src/main/java/net/shibboleth/idp/module/impl/PluginIdPModule.java
index 742384b2d..1936482d6 100644
--- a/idp-admin-impl/src/main/java/net/shibboleth/idp/module/impl/PluginIdPModule.java
+++ b/idp-admin-impl/src/main/java/net/shibboleth/idp/module/impl/PluginIdPModule.java
@@ -17,6 +17,7 @@ package net.shibboleth.idp.module.impl;
import java.io.IOException;
import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import net.shibboleth.idp.module.IdPModule;
import net.shibboleth.idp.module.PropertyDrivenIdPModule;
@@ -59,8 +60,10 @@ public class PluginIdPModule extends PropertyDrivenIdPModule {
*
* @throws IOException if an I/O error occurs
* @throws ModuleException if a generic error occurs
+ *
+ * @since 5.1.0
*/
- protected PluginIdPModule(@Nonnull final String version, @Nonnull final Class<? extends IdPModule> claz)
+ protected PluginIdPModule(@Nullable final String version, @Nonnull final Class<? extends IdPModule> claz)
throws IOException, ModuleException {
super(version, claz);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list