[java-identity-provider] branch main updated: More strays.

[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=28853949a0862eb00b612ad7e1776d49a122181c

The following commit(s) were added to refs/heads/main by this push:
     new 28853949a More strays.
28853949a is described below

commit 28853949a0862eb00b612ad7e1776d49a122181c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jun 20 19:40:44 2023 -0400

    More strays.
---
 .../saml1/profile/impl/AddAttributeStatementToAssertion.java   |  3 +--
 .../java/net/shibboleth/idp/saml/impl/testing/TestSources.java | 10 +++++-----
 .../java/net/shibboleth/idp/ui/impl/SetRPUIInformation.java    |  3 +--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertion.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertion.java
index 321a71082..427aea6d4 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertion.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertion.java
@@ -45,7 +45,6 @@ import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
 import net.shibboleth.idp.profile.IdPEventIds;
 import net.shibboleth.idp.saml.profile.impl.BaseAddAttributeStatementToAssertion;
-import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NullableElements;
 import net.shibboleth.shared.logic.Constraint;
 import net.shibboleth.shared.service.ServiceException;
@@ -210,7 +209,7 @@ public class AddAttributeStatementToAssertion extends BaseAddAttributeStatementT
      */
     private void encodeAttribute(@Nonnull final AttributeTranscoderRegistry registry,
             @Nonnull final ProfileRequestContext profileRequestContext,
-            @Nonnull final IdPAttribute attribute, @Nonnull @NonnullElements final Collection<Attribute> results)
+            @Nonnull final IdPAttribute attribute, @Nonnull final Collection<Attribute> results)
                     throws AttributeEncodingException {
 
         log.debug("{} Attempting to encode attribute {} as a SAML 1 Attribute", getLogPrefix(), attribute.getId());
diff --git a/idp-testing/src/main/java/net/shibboleth/idp/saml/impl/testing/TestSources.java b/idp-testing/src/main/java/net/shibboleth/idp/saml/impl/testing/TestSources.java
index 0d24a1b57..0f093644f 100644
--- a/idp-testing/src/main/java/net/shibboleth/idp/saml/impl/testing/TestSources.java
+++ b/idp-testing/src/main/java/net/shibboleth/idp/saml/impl/testing/TestSources.java
@@ -43,7 +43,6 @@ import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
 import net.shibboleth.idp.saml.attribute.resolver.impl.SAML2NameIDAttributeDefinition;
 import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NullableElements;
 import net.shibboleth.shared.collection.CollectionSupport;
 import net.shibboleth.shared.component.ComponentInitializationException;
@@ -134,7 +133,7 @@ public final class TestSources {
      * @return The connector
      * @throws ComponentInitializationException if we cannot initialized (unlikely)
      */
-    @Nonnull public static DataConnector populatedStaticConnector(@Nonnull @NonnullElements final List<IdPAttribute> attributes)
+    @Nonnull public static DataConnector populatedStaticConnector(@Nonnull final List<IdPAttribute> attributes)
             throws ComponentInitializationException {
 
         final StaticDataConnector connector = new StaticDataConnector();
@@ -301,7 +300,7 @@ public final class TestSources {
 
         /** {@inheritDoc} */
         @Override @Nonnull protected IdPAttribute doAttributeDefinitionResolve(
-                final @Nonnull AttributeResolutionContext resolutionContext,
+                @Nonnull final AttributeResolutionContext resolutionContext,
                 @Nonnull final AttributeResolverWorkContext workContext) throws ResolutionException {
             assert value != null;
             return value;
@@ -321,7 +320,7 @@ public final class TestSources {
     private static class StaticDataConnector extends AbstractDataConnector {
 
         /** Static collection of values returned by this connector. */
-        private Map<String, IdPAttribute> attributes;
+        @Nullable private Map<String, IdPAttribute> attributes;
 
         /**
          * Get the static values returned by this connector.
@@ -373,4 +372,5 @@ public final class TestSources {
         }
 
     }
-}
+
+}
\ No newline at end of file
diff --git a/idp-ui/src/main/java/net/shibboleth/idp/ui/impl/SetRPUIInformation.java b/idp-ui/src/main/java/net/shibboleth/idp/ui/impl/SetRPUIInformation.java
index a331e74cc..4cdeaad70 100644
--- a/idp-ui/src/main/java/net/shibboleth/idp/ui/impl/SetRPUIInformation.java
+++ b/idp-ui/src/main/java/net/shibboleth/idp/ui/impl/SetRPUIInformation.java
@@ -44,7 +44,6 @@ import net.shibboleth.idp.profile.AbstractProfileAction;
 import net.shibboleth.idp.ui.context.RelyingPartyUIContext;
 import net.shibboleth.saml.profile.context.navigate.SAMLMetadataContextLookupFunction;
 import net.shibboleth.shared.annotation.constraint.NonnullBeforeExec;
-import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.logic.Constraint;
 import net.shibboleth.shared.primitive.LoggerFactory;
 import net.shibboleth.shared.primitive.NonnullSupplier;
@@ -142,7 +141,7 @@ public class SetRPUIInformation extends AbstractProfileAction {
      * 
      * @param langs a semi-colon separated string.
      */
-    public void setFallbackLanguages(@Nonnull @NonnullElements final List<String> langs) {
+    public void setFallbackLanguages(@Nonnull final List<String> langs) {
         checkSetterPreconditions();
         fallbackLanguages = List.copyOf(StringSupport.normalizeStringCollection(langs));
     }

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