[java-identity-provider] branch main updated: Javadoc issues and other warnings.

[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=6297f9dd68ade5623c7aec2b00c54affc2639509

The following commit(s) were added to refs/heads/main by this push:
     new 6297f9dd6 Javadoc issues and other warnings.
6297f9dd6 is described below

commit 6297f9dd68ade5623c7aec2b00c54affc2639509
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Feb 9 15:20:04 2023 -0500

    Javadoc issues and other warnings.
---
 .../main/java/net/shibboleth/idp/profile/IdPEventIds.java   | 13 ++++++++-----
 .../CriteriaRelyingPartyConfigurationResolver.java          |  5 +++--
 .../idp/relyingparty/RelyingPartyConfiguration.java         |  6 +++---
 .../idp/relyingparty/RelyingPartyConfigurationResolver.java |  5 +++--
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/IdPEventIds.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/IdPEventIds.java
index 7f1eddc86..c2f2bd140 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/IdPEventIds.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/IdPEventIds.java
@@ -19,6 +19,9 @@ package net.shibboleth.idp.profile;
 
 import javax.annotation.Nonnull;
 
+import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
+import net.shibboleth.profile.config.ProfileConfiguration;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 
 // TODO: move attribute related events into that module?
@@ -30,28 +33,28 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 public final class IdPEventIds {
 
     /**
-     * ID of event returned if the {@link net.shibboleth.idp.profile.context.RelyingPartyContext} is missing or corrupt.
+     * ID of event returned if the {@link RelyingPartyContext} is missing or corrupt.
      */
     @Nonnull @NotEmpty public static final String INVALID_RELYING_PARTY_CTX = "InvalidRelyingPartyContext";
 
     /**
-     * ID of event returned if the {@link net.shibboleth.idp.relyingparty.RelyingPartyConfiguration} is missing or
+     * ID of event returned if the {@link RelyingPartyConfiguration} is missing or
      * corrupt.
      */
     @Nonnull @NotEmpty public static final String INVALID_RELYING_PARTY_CONFIG = "InvalidRelyingPartyConfiguration";
 
     /**
-     * ID of event returned if the {@link net.shibboleth.idp.profile.config.ProfileConfiguration} is missing or corrupt.
+     * ID of event returned if the {@link ProfileConfiguration} is missing or corrupt.
      */
     @Nonnull @NotEmpty public static final String INVALID_PROFILE_CONFIG = "InvalidProfileConfiguration";
 
     /**
-     * ID of event returned if the @link net.shibboleth.idp.attribute.context.AttributeContext is missing or corrupt.
+     * ID of event returned if the @link AttributeContext is missing or corrupt.
      */
     @Nonnull @NotEmpty public static final String INVALID_ATTRIBUTE_CTX = "InvalidAttributeContext";
 
     /**
-     * ID of event returned if the @link net.shibboleth.idp.authn.context.SubjectContext is missing or corrupt.
+     * ID of event returned if the @link SubjectContext is missing or corrupt.
      */
     @Nonnull @NotEmpty public static final String INVALID_SUBJECT_CTX = "InvalidSubjectContext";
 
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/CriteriaRelyingPartyConfigurationResolver.java b/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/CriteriaRelyingPartyConfigurationResolver.java
index 8528ea9e5..301005b7b 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/CriteriaRelyingPartyConfigurationResolver.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/CriteriaRelyingPartyConfigurationResolver.java
@@ -22,6 +22,7 @@ import javax.annotation.Nullable;
 
 import org.opensaml.security.config.SecurityConfiguration;
 
+import net.shibboleth.profile.config.ProfileConfiguration;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.IdentifiedComponent;
 import net.shibboleth.shared.resolver.CriteriaSet;
@@ -34,8 +35,8 @@ public interface CriteriaRelyingPartyConfigurationResolver extends Resolver<Rely
     /**
      * Return the default security configuration for the profile.
      * 
-     * @param profileId the profile ID (available via
-     *      {@link net.shibboleth.idp.profile.config.ProfileConfiguration#getId()}
+     * @param profileId the profile ID (available via {@link ProfileConfiguration#getId()}
+     * 
      * @return the configured default configuration
      */
     @Nullable SecurityConfiguration getDefaultSecurityConfiguration(@Nonnull @NotEmpty final String profileId);
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java b/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
index e3f2d2b0c..9f3129ca0 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
@@ -18,7 +18,6 @@
 package net.shibboleth.idp.relyingparty;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,6 +35,7 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.collection.CollectionSupport;
 import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.component.IdentifiedComponent;
@@ -146,9 +146,9 @@ public class RelyingPartyConfiguration extends AbstractIdentifiableInitializable
         
         final Map<String,ProfileConfiguration> map = profileConfigurationsLookupStrategy.apply(profileRequestContext);
         if (map != null) {
-            return Map.copyOf(map);
+            return CollectionSupport.copyToMap(map);
         }
-        return Collections.emptyMap();
+        return CollectionSupport.emptyMap();
     }
 
     /**
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java b/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java
index 5db68ee61..41f7c3e98 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java
@@ -20,6 +20,7 @@ package net.shibboleth.idp.relyingparty;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.shibboleth.profile.config.ProfileConfiguration;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.IdentifiedComponent;
 import net.shibboleth.shared.resolver.Resolver;
@@ -34,8 +35,8 @@ public interface RelyingPartyConfigurationResolver extends Resolver<RelyingParty
     /**
      * Return the default security configuration for the profile.
      * 
-     * @param profileId the profile ID (available via
-     *      {@link net.shibboleth.idp.profile.config.ProfileConfiguration#getId()}
+     * @param profileId the profile ID (available via {@link ProfileConfiguration#getId()}
+     * 
      * @return the configured default configuration
      */
     @Nullable SecurityConfiguration getDefaultSecurityConfiguration(@Nonnull @NotEmpty final String profileId);

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