[java-opensaml] branch master updated: Clean up collection setters with StringSupport routine.
Scott Cantor
cantor.2 at osu.edu
Thu Oct 26 11:32:11 EDT 2017
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=e0bb60bfc080539e2890755a9fe2e2f46ec9d7f9
The following commit(s) were added to refs/heads/master by this push:
new e0bb60b Clean up collection setters with StringSupport routine.
e0bb60b is described below
commit e0bb60bfc080539e2890755a9fe2e2f46ec9d7f9
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Oct 26 11:32:10 2017 -0400
Clean up collection setters with StringSupport routine.
---
.../profile/logic/AbstractNameIDPolicyPredicate.java | 11 +++--------
.../common/profile/logic/DefaultLocalErrorPredicate.java | 14 ++------------
.../common/profile/logic/EntityGroupNamePredicate.java | 14 +++-----------
.../saml/common/profile/logic/EntityIdPredicate.java | 13 ++-----------
.../profile/logic/RegistrationAuthorityPredicate.java | 14 +++-----------
.../common/profile/logic/RegistrationPolicyPredicate.java | 14 +++-----------
6 files changed, 16 insertions(+), 64 deletions(-)
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java
index 8ce27bc..4778f0f 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java
@@ -109,15 +109,10 @@ public abstract class AbstractNameIDPolicyPredicate extends AbstractInitializabl
*
* @param newFormats formats to apply predicate to
*/
- public void setFormats(@Nonnull @NonnullElements final Collection<String> newFormats) {
- Constraint.isNotNull(formats, "Format collection cannot be null");
+ public void setFormats(@Nullable final Collection<String> newFormats) {
+ ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
- for (final String s : newFormats) {
- final String trimmed = StringSupport.trimOrNull(s);
- if (trimmed != null) {
- formats.add(trimmed);
- }
- }
+ formats = new HashSet<>(StringSupport.normalizeStringCollection(newFormats));
}
/** {@inheritDoc} */
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/DefaultLocalErrorPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/DefaultLocalErrorPredicate.java
index 14ec8b3..5444aad 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/DefaultLocalErrorPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/DefaultLocalErrorPredicate.java
@@ -126,18 +126,8 @@ public class DefaultLocalErrorPredicate implements Predicate<ProfileRequestConte
*
* @param events locally handled events
*/
- public void setLocalEvents(@Nonnull @NonnullElements final Collection<String> events) {
- if (events == null) {
- localEvents = Collections.emptySet();
- } else {
- localEvents = new HashSet<>(events.size());
- for (final String e : events) {
- final String trimmed = StringSupport.trimOrNull(e);
- if (trimmed != null) {
- localEvents.add(trimmed);
- }
- }
- }
+ public void setLocalEvents(@Nullable final Collection<String> events) {
+ localEvents = new HashSet<>(StringSupport.normalizeStringCollection(events));
}
// Checkstyle: CyclomaticComplexity OFF
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicate.java
index 500ffef..e645172 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicate.java
@@ -28,7 +28,6 @@ import javax.annotation.Nullable;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
@@ -68,7 +67,7 @@ public class EntityGroupNamePredicate implements Predicate<EntityDescriptor> {
*
* @param names the group names to test for
*/
- public EntityGroupNamePredicate(@Nonnull @NonnullElements final Collection<String> names) {
+ public EntityGroupNamePredicate(@Nullable final Collection<String> names) {
this(names, null);
}
@@ -80,17 +79,10 @@ public class EntityGroupNamePredicate implements Predicate<EntityDescriptor> {
*
* @since 3.4.0
*/
- public EntityGroupNamePredicate(@Nonnull @NonnullElements final Collection<String> names,
+ public EntityGroupNamePredicate(@Nullable final Collection<String> names,
@Nullable final MetadataResolver resolver) {
- Constraint.isNotNull(names, "Group name collection cannot be null");
- groupNames = new HashSet<>(names.size());
- for (final String name : names) {
- final String trimmed = StringSupport.trimOrNull(name);
- if (trimmed != null) {
- groupNames.add(trimmed);
- }
- }
+ groupNames = new HashSet<>(StringSupport.normalizeStringCollection(names));
metadataResolver = resolver;
if (resolver != null) {
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java
index 46dfb68..09a4637 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java
@@ -29,7 +29,6 @@ import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import com.google.common.base.Predicate;
@@ -48,16 +47,8 @@ public class EntityIdPredicate implements Predicate<EntityDescriptor> {
*
* @param ids the entityIDs to check for
*/
- public EntityIdPredicate(@Nonnull @NonnullElements final Collection<String> ids) {
- Constraint.isNotNull(ids, "EntityID collection cannot be null");
-
- entityIds = new HashSet<>(ids.size());
- for (final String id : ids) {
- final String trimmed = StringSupport.trimOrNull(id);
- if (trimmed != null) {
- entityIds.add(trimmed);
- }
- }
+ public EntityIdPredicate(@Nullable final Collection<String> ids) {
+ entityIds = new HashSet<>(StringSupport.normalizeStringCollection(ids));
}
/**
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationAuthorityPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationAuthorityPredicate.java
index 6ffcb64..264c59b 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationAuthorityPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationAuthorityPredicate.java
@@ -22,11 +22,11 @@ import java.util.HashSet;
import java.util.Set;
import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import org.opensaml.saml.ext.saml2mdrpi.RegistrationInfo;
@@ -47,16 +47,8 @@ public class RegistrationAuthorityPredicate extends AbstractRegistrationInfoPre
*
* @param names the authority names to test for
*/
- public RegistrationAuthorityPredicate(@Nonnull @NonnullElements final Collection<String> names) {
-
- Constraint.isNotNull(names, "Authority name collection cannot be null");
- authorities = new HashSet<>(names.size());
- for (final String name : names) {
- final String trimmed = StringSupport.trimOrNull(name);
- if (trimmed != null) {
- authorities.add(trimmed);
- }
- }
+ public RegistrationAuthorityPredicate(@Nullable final Collection<String> names) {
+ authorities = new HashSet<>(StringSupport.normalizeStringCollection(names));
}
/**
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationPolicyPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationPolicyPredicate.java
index 51debb3..6fdd3df 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationPolicyPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/RegistrationPolicyPredicate.java
@@ -22,11 +22,11 @@ import java.util.HashSet;
import java.util.Set;
import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import org.opensaml.saml.ext.saml2mdrpi.RegistrationInfo;
@@ -48,16 +48,8 @@ public class RegistrationPolicyPredicate extends AbstractRegistrationInfoPredic
*
* @param policies the policies to test for
*/
- public RegistrationPolicyPredicate(@Nonnull @NonnullElements final Collection<String> policies) {
-
- Constraint.isNotNull(policies, "Authority name collection cannot be null");
- policySet = new HashSet<>(policies.size());
- for (final String policy : policies) {
- final String trimmed = StringSupport.trimOrNull(policy);
- if (trimmed != null) {
- policies.add(trimmed);
- }
- }
+ public RegistrationPolicyPredicate(@Nullable final Collection<String> policies) {
+ policySet = new HashSet<>(StringSupport.normalizeStringCollection(policies));
}
/**
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list