[java-opensaml] branch main updated: Removing additional Guava dependencies.
Scott Cantor
cantor.2 at osu.edu
Thu Apr 20 13:17:48 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=cc05a6023e663c2a32841320000083f6c10b7883
The following commit(s) were added to refs/heads/main by this push:
new cc05a6023 Removing additional Guava dependencies.
cc05a6023 is described below
commit cc05a6023e663c2a32841320000083f6c10b7883
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Apr 20 09:17:45 2023 -0400
Removing additional Guava dependencies.
---
.../java/org/opensaml/saml/common/binding/BindingDescriptor.java | 4 ++--
.../opensaml/saml/ext/saml2mdattr/impl/EntityAttributesImpl.java | 5 ++---
.../saml/metadata/resolver/impl/ChainingMetadataResolverTest.java | 5 ++---
.../metadata/resolver/impl/FilesystemMetadataResolverTest.java | 4 ++--
.../metadata/resolver/impl/LocalDynamicMetadataResolverTest.java | 4 ++--
.../metadata/resolver/impl/ResourceBackedMetadataResolverTest.java | 5 ++---
.../metadata/resolver/index/impl/EndpointMetadataIndexTest.java | 5 ++---
.../impl/PopulateHttpClientSecurityParametersHandlerTest.java | 7 +++----
8 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/BindingDescriptor.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/BindingDescriptor.java
index 49f21c205..92226a493 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/BindingDescriptor.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/BindingDescriptor.java
@@ -42,12 +42,12 @@ import javax.annotation.Nullable;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.primitive.StringSupport;
import org.opensaml.profile.context.ProfileRequestContext;
import com.google.common.base.MoreObjects;
-import com.google.common.base.Predicates;
/**
* A class that describes a SAML binding and encapsulates information required for
@@ -79,7 +79,7 @@ public class BindingDescriptor extends AbstractIdentifiableInitializableComponen
synchronous = false;
artifact = false;
signatureCapable = false;
- activationCondition = Predicates.alwaysTrue();
+ activationCondition = PredicateSupport.alwaysTrue();
}
/**
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesImpl.java
index 12123464d..3a6b3030f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesImpl.java
@@ -31,11 +31,10 @@ import org.opensaml.saml.ext.saml2mdattr.EntityAttributes;
import org.opensaml.saml.saml2.core.Assertion;
import org.opensaml.saml.saml2.core.Attribute;
-import com.google.common.base.Predicates;
-
import net.shibboleth.shared.annotation.constraint.Live;
import net.shibboleth.shared.annotation.constraint.NotLive;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.logic.PredicateSupport;
/** Concrete implementation of {@link EntityAttributes}. */
public class EntityAttributesImpl extends AbstractXMLObject implements EntityAttributes {
@@ -82,7 +81,7 @@ public class EntityAttributesImpl extends AbstractXMLObject implements EntityAtt
return attributeInfo
.stream()
- .filter(Predicates.or(Assertion.class::isInstance, Attribute.class::isInstance))
+ .filter(PredicateSupport.or(Assertion.class::isInstance, Attribute.class::isInstance))
.collect(Collectors.toUnmodifiableList());
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolverTest.java
index e0acf09ee..886e52fd7 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolverTest.java
@@ -33,9 +33,8 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.base.Predicates;
-
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.resolver.CriteriaSet;
@SuppressWarnings("javadoc")
@@ -83,7 +82,7 @@ public class ChainingMetadataResolverTest extends XMLObjectBaseTestCase {
@Test()
public void testInactive() throws Exception {
- metadataProvider.setActivationCondition(Predicates.alwaysFalse());
+ metadataProvider.setActivationCondition(PredicateSupport.alwaysFalse());
metadataProvider.initialize();
EntityDescriptor descriptor = metadataProvider.resolveSingle(new CriteriaSet(new EntityIdCriterion(entityID)));
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolverTest.java
index 080e2872d..4a43d9f50 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolverTest.java
@@ -23,6 +23,7 @@ import java.net.URISyntaxException;
import java.net.URL;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.resolver.CriteriaSet;
import net.shibboleth.shared.resolver.ResolverException;
@@ -33,7 +34,6 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.base.Predicates;
import com.google.common.io.Files;
@SuppressWarnings("javadoc")
@@ -64,7 +64,7 @@ public class FilesystemMetadataResolverTest extends XMLObjectBaseTestCase {
metadataProvider = new FilesystemMetadataResolver(mdFile);
metadataProvider.setParserPool(parserPool);
metadataProvider.setId("test");
- metadataProvider.setActivationCondition(Predicates.alwaysFalse());
+ metadataProvider.setActivationCondition(PredicateSupport.alwaysFalse());
metadataProvider.initialize();
final Boolean flag = metadataProvider.wasLastRefreshSuccess();
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolverTest.java
index b40316673..d2b2f6a6c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolverTest.java
@@ -33,12 +33,12 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.base.Predicates;
import com.google.common.util.concurrent.Uninterruptibles;
import net.shibboleth.shared.codec.StringDigester;
import net.shibboleth.shared.codec.StringDigester.OutputFormat;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.resolver.CriteriaSet;
import net.shibboleth.shared.resolver.ResolverException;
@@ -93,7 +93,7 @@ public class LocalDynamicMetadataResolverTest extends XMLObjectBaseTestCase {
resolver = new LocalDynamicMetadataResolver(null, sourceManager, new IdentityEntityIDGenerator());
resolver.setId("abc123");
resolver.setParserPool(parserPool);
- resolver.setActivationCondition(Predicates.alwaysFalse());
+ resolver.setActivationCondition(PredicateSupport.alwaysFalse());
resolver.initialize();
sourceManager.save(entityID1, entity1);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java
index 29a1f8088..41cce52ef 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java
@@ -22,6 +22,7 @@ import java.net.URL;
import java.time.Duration;
import java.util.Timer;
+import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.resolver.CriteriaSet;
import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.shared.resource.Resource;
@@ -35,8 +36,6 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.base.Predicates;
-
/** Unit test for {@link ResourceBackedMetadataResolver}. */
public class ResourceBackedMetadataResolverTest extends XMLObjectBaseTestCase {
@@ -75,7 +74,7 @@ public class ResourceBackedMetadataResolverTest extends XMLObjectBaseTestCase {
metadataProvider.setParserPool(parserPool);
metadataProvider.setMaxRefreshDelay(Duration.ofSeconds(500));
metadataProvider.setId("test");
- metadataProvider.setActivationCondition(Predicates.alwaysFalse());
+ metadataProvider.setActivationCondition(PredicateSupport.alwaysFalse());
metadataProvider.initialize();
criteriaSet = new CriteriaSet(new EntityIdCriterion(entityID));
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndexTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndexTest.java
index 45ca80509..a06d3e84c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndexTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndexTest.java
@@ -45,8 +45,7 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.base.Predicates;
-
+import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.resolver.CriteriaSet;
@SuppressWarnings("javadoc")
@@ -176,7 +175,7 @@ public class EndpointMetadataIndexTest extends XMLObjectBaseTestCase {
@Test
public void testGenerateKeysFromDescriptorAlwaysFalseSelector() {
- EndpointMetadataIndex metadataIndex = new EndpointMetadataIndex(Predicates.alwaysFalse());
+ EndpointMetadataIndex metadataIndex = new EndpointMetadataIndex(PredicateSupport.alwaysFalse());
final Set<MetadataIndexKey> keys = metadataIndex.generateKeys(descriptor);
assert keys != null;
diff --git a/opensaml-security-impl/src/test/java/org/opensaml/security/messaging/impl/PopulateHttpClientSecurityParametersHandlerTest.java b/opensaml-security-impl/src/test/java/org/opensaml/security/messaging/impl/PopulateHttpClientSecurityParametersHandlerTest.java
index 25dcd1c70..3980aaf4d 100644
--- a/opensaml-security-impl/src/test/java/org/opensaml/security/messaging/impl/PopulateHttpClientSecurityParametersHandlerTest.java
+++ b/opensaml-security-impl/src/test/java/org/opensaml/security/messaging/impl/PopulateHttpClientSecurityParametersHandlerTest.java
@@ -42,11 +42,10 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.base.Predicates;
-
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.resolver.CriteriaSet;
import net.shibboleth.shared.resolver.ResolverException;
@@ -91,7 +90,7 @@ public class PopulateHttpClientSecurityParametersHandlerTest extends OpenSAMLIni
@Test public void testSuccessIncludeClientTLS() throws Exception {
handler.setHttpClientSecurityParametersResolver(new MockResolver(false));
- handler.setClientTLSPredicate(Predicates.<MessageContext>alwaysTrue());
+ handler.setClientTLSPredicate(PredicateSupport.alwaysTrue());
handler.initialize();
assert messageContext != null;
@@ -104,7 +103,7 @@ public class PopulateHttpClientSecurityParametersHandlerTest extends OpenSAMLIni
@Test public void testSuccessExcludeClientTLS() throws Exception {
handler.setHttpClientSecurityParametersResolver(new MockResolver(false));
- handler.setClientTLSPredicate(Predicates.<MessageContext>alwaysFalse());
+ handler.setClientTLSPredicate(PredicateSupport.alwaysFalse());
handler.initialize();
assert messageContext != null;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list