[java-shib-attribute] branch main updated: IDP-2083 - Treat NonnullElements as the default for collections
Scott Cantor
cantor.2 at osu.edu
Wed Jun 21 00:45:37 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-attribute.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=03df97584f2bc1c4aff9a372beca2d460ed19154
The following commit(s) were added to refs/heads/main by this push:
new 03df97584 IDP-2083 - Treat NonnullElements as the default for collections
03df97584 is described below
commit 03df97584f2bc1c4aff9a372beca2d460ed19154
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jun 20 20:45:35 2023 -0400
IDP-2083 - Treat NonnullElements as the default for collections
https://shibboleth.atlassian.net/browse/IDP-2083
Stray cleanup.
---
.../attribute/filter/matcher/logic/impl/AbstractComposedMatcher.java | 3 +--
.../policyrule/saml/impl/AbstractEntityAttributeRegexPolicyRule.java | 5 +----
.../filter/complex/impl/BaseComplexAttributeFilterTestCase.java | 3 +--
.../idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java | 3 +--
.../filter/spring/testing/BaseAttributeFilterParserTest.java | 3 +--
.../attribute/transcoding/impl/AttributeTranscoderRegistryImpl.java | 3 +--
.../net/shibboleth/idp/attribute/resolver/testing/TestSources.java | 3 +--
7 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AbstractComposedMatcher.java b/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AbstractComposedMatcher.java
index d3bd0bc31..0ef4274b4 100644
--- a/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AbstractComposedMatcher.java
+++ b/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AbstractComposedMatcher.java
@@ -24,7 +24,6 @@ import javax.annotation.Nullable;
import net.shibboleth.idp.attribute.filter.Matcher;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotLive;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.shared.collection.CollectionSupport;
@@ -46,7 +45,7 @@ public abstract class AbstractComposedMatcher extends AbstractIdentifiableInitia
* Called "subsidiaries" to allow easier parsing.
* @param composedMatchers the matchers to be composed.
*/
- public void setSubsidiaries(@Nullable @NonnullElements final List<Matcher> composedMatchers) {
+ public void setSubsidiaries(@Nullable final List<Matcher> composedMatchers) {
checkSetterPreconditions();
if (composedMatchers != null) {
diff --git a/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AbstractEntityAttributeRegexPolicyRule.java b/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AbstractEntityAttributeRegexPolicyRule.java
index 1afbefde5..ac467958e 100644
--- a/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AbstractEntityAttributeRegexPolicyRule.java
+++ b/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AbstractEntityAttributeRegexPolicyRule.java
@@ -24,8 +24,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.shared.annotation.constraint.NonnullElements;
-import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.ComponentInitializationException;
/**
@@ -63,8 +61,7 @@ public abstract class AbstractEntityAttributeRegexPolicyRule extends AbstractEnt
}
/** {@inheritDoc} */
- @Override protected boolean entityAttributeValueMatches(
- @Nonnull @NotEmpty @NonnullElements final Set<String> entityAttributeValues) {
+ @Override protected boolean entityAttributeValueMatches(@Nonnull final Set<String> entityAttributeValues) {
return entityAttributeValues.stream().anyMatch(v -> valueRegex.matcher(v).matches());
}
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/BaseComplexAttributeFilterTestCase.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/BaseComplexAttributeFilterTestCase.java
index a23f35c7c..987adf41c 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/BaseComplexAttributeFilterTestCase.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/BaseComplexAttributeFilterTestCase.java
@@ -28,7 +28,6 @@ import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
import net.shibboleth.idp.attribute.resolver.dc.impl.testing.SAMLAttributeDataConnector;
-import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
@@ -55,7 +54,7 @@ public class BaseComplexAttributeFilterTestCase extends XMLObjectBaseTestCase {
* @throws ComponentInitializationException ...
* @throws ResolutionException ...
*/
- @Nonnull @NonnullElements protected Map<String,IdPAttribute> getIdPAttributes(@Nonnull @NotEmpty String xmlFileName)
+ @Nonnull protected Map<String,IdPAttribute> getIdPAttributes(@Nonnull @NotEmpty String xmlFileName)
throws ComponentInitializationException, ResolutionException {
final EntityAttributes obj = (EntityAttributes) unmarshallElement(PATH + xmlFileName);
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java
index 05be38da3..17443feae 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java
@@ -35,7 +35,6 @@ import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.filter.Matcher;
import net.shibboleth.idp.attribute.filter.matcher.impl.AbstractMatcherPolicyRuleTest;
import net.shibboleth.idp.attribute.filter.matcher.impl.MockValuePredicateMatcher;
-import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.DestroyedComponentException;
@@ -133,7 +132,7 @@ public class AndMatcherTest extends AbstractMatcherPolicyRuleTest {
assertTrue(result.isEmpty());
}
- static public AndMatcher newAndMatcher(final @Nonnull @NonnullElements List<Matcher> what) {
+ static public AndMatcher newAndMatcher(final @Nonnull List<Matcher> what) {
final AndMatcher matcher = new AndMatcher();
matcher.setSubsidiaries(what);
return matcher;
diff --git a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/testing/BaseAttributeFilterParserTest.java b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/testing/BaseAttributeFilterParserTest.java
index 1775c0a35..ba933d835 100644
--- a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/testing/BaseAttributeFilterParserTest.java
+++ b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/testing/BaseAttributeFilterParserTest.java
@@ -43,7 +43,6 @@ import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
import net.shibboleth.idp.attribute.resolver.dc.impl.testing.SAMLAttributeDataConnector;
-import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
@@ -118,7 +117,7 @@ public class BaseAttributeFilterParserTest extends XMLObjectBaseTestCase {
return afp.getPolicyRequirementRule();
}
- @Nonnull @NonnullElements protected List<AttributeRule> getAttributeRulesAttributeFilterPolicy(
+ @Nonnull protected List<AttributeRule> getAttributeRulesAttributeFilterPolicy(
@Nonnull @NotEmpty final String fileName, @Nonnull final GenericApplicationContext ctx) {
final AttributeFilterPolicy afp = getBean(fileName, AttributeFilterPolicy.class, ctx);
diff --git a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImpl.java b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImpl.java
index f4572b4af..b2c8e1294 100644
--- a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImpl.java
+++ b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImpl.java
@@ -42,7 +42,6 @@ import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoder;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
-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;
@@ -134,7 +133,7 @@ public class AttributeTranscoderRegistryImpl extends AbstractIdentifiableInitial
*
* @param mappings transcoding rulesets
*/
- public void setTranscoderRegistry(@Nonnull @NonnullElements final Collection<TranscodingRule> mappings) {
+ public void setTranscoderRegistry(@Nonnull final Collection<TranscodingRule> mappings) {
checkSetterPreconditions();
Constraint.isNotNull(mappings, "Mappings cannot be null");
diff --git a/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/TestSources.java b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/TestSources.java
index de4d8e669..22d5605c1 100644
--- a/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/TestSources.java
+++ b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/TestSources.java
@@ -42,7 +42,6 @@ import net.shibboleth.idp.attribute.resolver.ResolverDataConnectorDependency;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.annotation.constraint.NullableElements;
import net.shibboleth.shared.collection.CollectionSupport;
@@ -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();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list