[java-metadata-aggregator] branch master updated: MDA-238 - Migrate from use of Guava functional interfaces to Java ones
Ian Young
ian at iay.org.uk
Fri Mar 13 06:46:43 EDT 2020
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch master
in repository java-metadata-aggregator.
View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=9c0c56f19ff6106c82788acd5a0015684b9de1c3
The following commit(s) were added to refs/heads/master by this push:
new 9c0c56f MDA-238 - Migrate from use of Guava functional interfaces to Java ones
9c0c56f is described below
commit 9c0c56f19ff6106c82788acd5a0015684b9de1c3
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Fri Mar 13 10:46:28 2020 +0000
MDA-238 - Migrate from use of Guava functional interfaces to Java ones
https://issues.shibboleth.net/jira/browse/MDA-238
---
.../metadata/SimpleItemCollectionFactory.java | 10 +++---
.../net/shibboleth/metadata/dom/Container.java | 9 +++--
.../net/shibboleth/metadata/dom/ElementMaker.java | 4 +--
.../shibboleth/metadata/dom/ElementMatcher.java | 6 ++--
.../metadata/dom/XPathItemSelectionStrategy.java | 10 +++---
.../metadata/dom/saml/AttributeElementMatcher.java | 6 ++--
.../dom/saml/AttributeValueElementMatcher.java | 6 ++--
.../shibboleth/metadata/dom/saml/SAMLSupport.java | 6 ++--
.../mdattr/AbstractEntityAttributeMatcher.java | 6 ++--
.../saml/mdattr/EntityAttributeAddingStage.java | 5 ++-
.../saml/mdattr/EntityAttributeFilteringStage.java | 5 ++-
.../metadata/dom/saml/mdattr/MDAttrSupport.java | 6 ++--
.../dom/saml/mdattr/MultiPredicateMatcher.java | 21 ++++++-----
.../saml/mdattr/RegistrationAuthorityMatcher.java | 6 ++--
.../metadata/pipeline/AbstractStage.java | 11 +++---
.../pipeline/AtLeastCollectionPredicate.java | 6 ++--
.../FilesInDirectoryMultiOutputStrategy.java | 6 ++--
.../metadata/pipeline/ItemIdTransformStage.java | 3 +-
.../pipeline/MDQueryMD5ItemIdTransformer.java | 4 +--
.../pipeline/MDQuerySHA1ItemIdTransformer.java | 4 +--
.../pipeline/PipelineDemultiplexerStage.java | 7 ++--
.../metadata/pipeline/PipelineMergeStage.java | 3 +-
.../metadata/pipeline/SplitMergeStage.java | 12 +++----
.../util/PathSegmentStringTransformer.java | 3 +-
.../metadata/util/SHA1StringTransformer.java | 4 +--
.../net/shibboleth/metadata/dom/ContainerTest.java | 16 ++++-----
.../shibboleth/metadata/dom/ElementMakerTest.java | 4 +--
.../metadata/dom/ElementMatcherTest.java | 13 +++----
.../dom/XPathItemSelectionStrategyTest.java | 6 ++--
.../dom/saml/AttributeElementMakerTest.java | 4 +--
.../dom/saml/AttributeElementMatcherTest.java | 22 ++++++------
.../dom/saml/AttributeValueElementMakerTest.java | 4 +--
.../dom/saml/AttributeValueElementMatcherTest.java | 14 ++++----
.../AssuranceCertificationMatcherSpringTest.java | 8 ++---
.../mdattr/AssuranceCertificationMatcherTest.java | 6 ++--
.../mdattr/EntityAttributeFilteringStageTest.java | 6 ++--
.../mdattr/EntityCategoryMatcherSpringTest.java | 6 ++--
.../dom/saml/mdattr/EntityCategoryMatcherTest.java | 6 ++--
.../mdattr/EntityCategorySupportMatcherTest.java | 6 ++--
.../dom/saml/mdattr/MultiPredicateMatcherTest.java | 41 +++++++++++-----------
.../mdattr/RegistrationAuthorityMatcherTest.java | 6 ++--
.../metadata/pipeline/AbstractStageTest.java | 10 +++---
.../pipeline/AtLeastCollectionPredicateTest.java | 8 ++---
.../FilesInDirectoryMultiOutputStrategyTest.java | 2 +-
.../pipeline/ItemIdTransformStageTest.java | 5 ++-
.../pipeline/PipelineDemultiplexerStageTest.java | 13 ++++---
.../metadata/pipeline/SplitMergeStageTest.java | 27 +++++++-------
.../util/PathSegmentStringTransformerTest.java | 4 +--
.../metadata/util/SHA1StringTransformerTest.java | 4 +--
49 files changed, 188 insertions(+), 222 deletions(-)
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/SimpleItemCollectionFactory.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/SimpleItemCollectionFactory.java
index 55b4574..ae6e161 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/SimpleItemCollectionFactory.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/SimpleItemCollectionFactory.java
@@ -19,11 +19,10 @@ package net.shibboleth.metadata;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.function.Supplier;
import javax.annotation.Nonnull;
-import com.google.common.base.Supplier;
-
/**
* Implementation {@link Supplier} that produces {@link ArrayList} instances.
*
@@ -31,8 +30,9 @@ import com.google.common.base.Supplier;
*/
public class SimpleItemCollectionFactory<T> implements Supplier<Collection<Item<T>>> {
- /** {@inheritDoc} */
- @Override @Nonnull public Collection<Item<T>> get() {
+ @Override
+ @Nonnull public Collection<Item<T>> get() {
return new ArrayList<>();
}
-}
\ No newline at end of file
+
+}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/Container.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/Container.java
index 25f9905..9061564 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/Container.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/Container.java
@@ -19,6 +19,8 @@ package net.shibboleth.metadata.dom;
import java.util.ArrayList;
import java.util.List;
+import java.util.function.Function;
+import java.util.function.Predicate;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -30,9 +32,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-
/**
* A wrapper for a DOM {@link Element} allowing its use as a container for either
* a simple text value or for other {@link Element}s. In the latter case, white-space
@@ -213,7 +212,7 @@ public class Container {
@Nullable
public Container findChild(@Nonnull final Predicate<Element> matcher) {
for (final Element e : ElementSupport.getChildElements(element)) {
- if (matcher.apply(e)) {
+ if (matcher.test(e)) {
return new Container(e, this);
}
}
@@ -230,7 +229,7 @@ public class Container {
public List<Container> findChildren(@Nonnull final Predicate<Element> matcher) {
final List<Container> list = new ArrayList<>();
for (final Element e : ElementSupport.getChildElements(element)) {
- if (matcher.apply(e)) {
+ if (matcher.test(e)) {
list.add(new Container(e, this));
}
}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementMaker.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementMaker.java
index 233e9de..57288bc 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementMaker.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementMaker.java
@@ -17,6 +17,8 @@
package net.shibboleth.metadata.dom;
+import java.util.function.Function;
+
import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
import javax.xml.namespace.QName;
@@ -25,8 +27,6 @@ import net.shibboleth.utilities.java.support.xml.ElementSupport;
import org.w3c.dom.Element;
-import com.google.common.base.Function;
-
/**
* Basic maker class for {@link Element}s for use with the {@link Container} system.
*/
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementMatcher.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementMatcher.java
index aeab7cc..ae12a4f 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementMatcher.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementMatcher.java
@@ -17,6 +17,8 @@
package net.shibboleth.metadata.dom;
+import java.util.function.Predicate;
+
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
@@ -26,8 +28,6 @@ import net.shibboleth.utilities.java.support.xml.ElementSupport;
import org.w3c.dom.Element;
-import com.google.common.base.Predicate;
-
/**
* Basic matcher class for {@link Element}s for use with the {@link Container} system.
*/
@@ -48,7 +48,7 @@ public class ElementMatcher implements Predicate<Element> {
}
@Override
- public boolean apply(@Nonnull final Element input) {
+ public boolean test(@Nonnull final Element input) {
return ElementSupport.isElementNamed(input, qname);
}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategy.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategy.java
index 5c1cf8f..56c53e4 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategy.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategy.java
@@ -17,6 +17,8 @@
package net.shibboleth.metadata.dom;
+import java.util.function.Predicate;
+
import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
import javax.xml.namespace.NamespaceContext;
@@ -34,8 +36,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
-import com.google.common.base.Predicate;
-
/**
* Item selection strategy which selects items on the basis of a boolean XPath expression.
*/
@@ -79,8 +79,8 @@ public class XPathItemSelectionStrategy implements Predicate<Item<Element>> {
compiledExpression = xpath.compile(expression);
}
- /** {@inheritDoc} */
- @Override public synchronized boolean apply(@Nonnull final Item<Element> item) {
+ @Override
+ public synchronized boolean test(@Nonnull final Item<Element> item) {
try {
return (Boolean) compiledExpression.evaluate(item.unwrap(), XPathConstants.BOOLEAN);
} catch (final XPathExpressionException e) {
@@ -88,4 +88,4 @@ public class XPathItemSelectionStrategy implements Predicate<Item<Element>> {
return false;
}
}
-}
\ No newline at end of file
+}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcher.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcher.java
index 4a7345f..02867cc 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcher.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcher.java
@@ -25,7 +25,7 @@ import net.shibboleth.metadata.dom.ElementMatcher;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
- * Match {@link com.google.common.base.Predicate} for SAML <code>Attribute</code> elements with specific
+ * Match {@link java.util.function.Predicate} for SAML <code>Attribute</code> elements with specific
* <code>Name</code> and <code>NameFormat</code> attributes,
* for use with the {@link net.shibboleth.metadata.dom.Container} system.
*/
@@ -50,9 +50,9 @@ public class AttributeElementMatcher extends ElementMatcher {
}
@Override
- public boolean apply(@Nonnull final Element element) {
+ public boolean test(@Nonnull final Element element) {
// check for element name
- if (!super.apply(element)) {
+ if (!super.test(element)) {
return false;
}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcher.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcher.java
index 386cd84..d8551c0 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcher.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcher.java
@@ -25,7 +25,7 @@ import net.shibboleth.metadata.dom.ElementMatcher;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
- * Match {@link com.google.common.base.Predicate} for SAML <code>AttributeValue</code> elements with specific
+ * Match {@link java.util.function.Predicate} for SAML <code>AttributeValue</code> elements with specific
* text values,
* for use with the {@link net.shibboleth.metadata.dom.Container} system.
*/
@@ -45,9 +45,9 @@ public class AttributeValueElementMatcher extends ElementMatcher {
}
@Override
- public boolean apply(@Nonnull final Element element) {
+ public boolean test(@Nonnull final Element element) {
// check for element name
- if (!super.apply(element)) {
+ if (!super.test(element)) {
return false;
}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLSupport.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLSupport.java
index fe09aa0..d794575 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLSupport.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLSupport.java
@@ -17,6 +17,9 @@
package net.shibboleth.metadata.dom.saml;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
import javax.xml.namespace.QName;
@@ -24,9 +27,6 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-
import net.shibboleth.metadata.dom.Container;
import net.shibboleth.metadata.dom.ElementMaker;
import net.shibboleth.metadata.dom.ElementMatcher;
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/AbstractEntityAttributeMatcher.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/AbstractEntityAttributeMatcher.java
index a6041d9..c8da885 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/AbstractEntityAttributeMatcher.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/AbstractEntityAttributeMatcher.java
@@ -17,12 +17,12 @@
package net.shibboleth.metadata.dom.saml.mdattr;
+import java.util.function.Predicate;
+
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
-import com.google.common.base.Predicate;
-
import net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage.EntityAttributeContext;
/**
@@ -71,7 +71,7 @@ public abstract class AbstractEntityAttributeMatcher implements Predicate<Entity
protected abstract boolean matchRegistrationAuthority(@Nullable final String inputRegistrationAuthority);
@Override
- public boolean apply(@Nonnull final EntityAttributeContext input) {
+ public boolean test(@Nonnull final EntityAttributeContext input) {
return matchRegistrationAuthority(input.getRegistrationAuthority()) &&
matchAttributeNameFormat(input.getNameFormat()) &&
matchAttributeName(input.getName()) &&
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java
index f5d6993..5e1a025 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java
@@ -18,6 +18,8 @@
package net.shibboleth.metadata.dom.saml.mdattr;
import java.util.List;
+import java.util.function.Function;
+import java.util.function.Predicate;
import javax.annotation.Nonnull;
@@ -25,9 +27,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.dom.Container;
import net.shibboleth.metadata.dom.saml.AttributeElementMaker;
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
index 11cca7c..39298c0 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
@@ -18,6 +18,7 @@
package net.shibboleth.metadata.dom.saml.mdattr;
import java.util.List;
+import java.util.function.Predicate;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -27,8 +28,6 @@ import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import com.google.common.base.Predicate;
-
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.WarningStatus;
import net.shibboleth.metadata.dom.saml.SAMLMetadataSupport;
@@ -284,7 +283,7 @@ public class EntityAttributeFilteringStage extends AbstractIteratingStage<Elemen
*/
private boolean applyRules(final EntityAttributeContext ctx) {
for (final Predicate<EntityAttributeContext> rule : rules) {
- if (rule.apply(ctx)) {
+ if (rule.test(ctx)) {
return true;
}
}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/MDAttrSupport.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/MDAttrSupport.java
index 93aec6d..ceab131 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/MDAttrSupport.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/MDAttrSupport.java
@@ -17,14 +17,14 @@
package net.shibboleth.metadata.dom.saml.mdattr;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
import javax.annotation.concurrent.ThreadSafe;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-
import net.shibboleth.metadata.dom.Container;
import net.shibboleth.metadata.dom.ElementMaker;
import net.shibboleth.metadata.dom.ElementMatcher;
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/MultiPredicateMatcher.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/MultiPredicateMatcher.java
index 6baef23..d31f9bd 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/MultiPredicateMatcher.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/MultiPredicateMatcher.java
@@ -17,15 +17,14 @@
package net.shibboleth.metadata.dom.saml.mdattr;
+import java.util.function.Predicate;
+
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-
/**
* An entity attribute matcher implementation that delegates each
* component match to a different @{link Predicate}. Each such
@@ -41,19 +40,19 @@ public class MultiPredicateMatcher extends AbstractEntityAttributeMatcher {
/** {@link Predicate} to use to match the context's attribute value. */
@Nonnull
- private Predicate<CharSequence> valuePredicate = Predicates.alwaysTrue();
+ private Predicate<CharSequence> valuePredicate = x -> true;
/** {@link Predicate} to use to match the context's attribute name. */
@Nonnull
- private Predicate<CharSequence> namePredicate = Predicates.alwaysTrue();
+ private Predicate<CharSequence> namePredicate = x -> true;
/** {@link Predicate} to use to match the context's attribute name format. */
@Nonnull
- private Predicate<CharSequence> nameFormatPredicate = Predicates.alwaysTrue();
+ private Predicate<CharSequence> nameFormatPredicate = x -> true;
/** {@link Predicate} to use to match the context's registration authority. */
@Nonnull
- private Predicate<CharSequence> registrationAuthorityPredicate = Predicates.alwaysTrue();
+ private Predicate<CharSequence> registrationAuthorityPredicate = x -> true;
/**
* Gets the {@link Predicate} being used to match the context's attribute value.
@@ -134,22 +133,22 @@ public class MultiPredicateMatcher extends AbstractEntityAttributeMatcher {
@Override
protected boolean matchAttributeValue(@Nonnull final String inputValue) {
- return valuePredicate.apply(inputValue);
+ return valuePredicate.test(inputValue);
}
@Override
protected boolean matchAttributeName(@Nonnull final String inputName) {
- return namePredicate.apply(inputName);
+ return namePredicate.test(inputName);
}
@Override
protected boolean matchAttributeNameFormat(@Nonnull final String inputNameFormat) {
- return nameFormatPredicate.apply(inputNameFormat);
+ return nameFormatPredicate.test(inputNameFormat);
}
@Override
protected boolean matchRegistrationAuthority(@Nullable final String inputRegistrationAuthority) {
- return registrationAuthorityPredicate.apply(inputRegistrationAuthority);
+ return registrationAuthorityPredicate.test(inputRegistrationAuthority);
}
}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/RegistrationAuthorityMatcher.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/RegistrationAuthorityMatcher.java
index 8d284e5..61848bf 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/RegistrationAuthorityMatcher.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/RegistrationAuthorityMatcher.java
@@ -17,12 +17,12 @@
package net.shibboleth.metadata.dom.saml.mdattr;
+import java.util.function.Predicate;
+
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
-import com.google.common.base.Predicate;
-
import net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage.EntityAttributeContext;
/**
@@ -48,7 +48,7 @@ public class RegistrationAuthorityMatcher implements Predicate<EntityAttributeCo
}
@Override
- public boolean apply(@Nonnull final EntityAttributeContext input) {
+ public boolean test(@Nonnull final EntityAttributeContext input) {
if (registrationAuthority == null) {
// match entities *without* a registration authority
return null == input.getRegistrationAuthority();
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractStage.java
index 01b5aad..11219ce 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractStage.java
@@ -19,13 +19,11 @@ package net.shibboleth.metadata.pipeline;
import java.util.Collection;
import java.util.Collections;
+import java.util.function.Predicate;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.util.ItemMetadataSupport;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
@@ -46,7 +44,7 @@ public abstract class AbstractStage<T> extends AbstractIdentifiableInitializable
* Default value: always <code>true</code>.
*/
@Nonnull
- private Predicate<Collection<Item<T>>> collectionPredicate = Predicates.alwaysTrue();
+ private Predicate<Collection<Item<T>>> collectionPredicate = x -> true;
/**
* Sets the {@link Predicate} applied to the supplied item collection to determine whether
@@ -87,7 +85,7 @@ public abstract class AbstractStage<T> extends AbstractIdentifiableInitializable
final ComponentInfo compInfo = new ComponentInfo(this);
- if (collectionPredicate.apply(itemCollection)) {
+ if (collectionPredicate.test(itemCollection)) {
doExecute(itemCollection);
}
@@ -108,4 +106,5 @@ public abstract class AbstractStage<T> extends AbstractIdentifiableInitializable
*/
protected abstract void doExecute(@Nonnull @NonnullElements final Collection<Item<T>> itemCollection)
throws StageProcessingException;
-}
\ No newline at end of file
+
+}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AtLeastCollectionPredicate.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AtLeastCollectionPredicate.java
index 89fab0f..863e125 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AtLeastCollectionPredicate.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AtLeastCollectionPredicate.java
@@ -18,8 +18,7 @@
package net.shibboleth.metadata.pipeline;
import java.util.Collection;
-
-import com.google.common.base.Predicate;
+import java.util.function.Predicate;
/**
* A {@link Predicate} which returns <code>true</code> if and only if the number of elements
@@ -56,9 +55,8 @@ public class AtLeastCollectionPredicate<T> implements Predicate<Collection<T>> {
minimum = min;
}
- /** {@inheritDoc} */
@Override
- public boolean apply(final Collection<T> input) {
+ public boolean test(final Collection<T> input) {
return input.size() >= minimum;
}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategy.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategy.java
index a020a35..e4a6bc6 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategy.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategy.java
@@ -22,15 +22,13 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.List;
+import java.util.function.Function;
import javax.annotation.Nonnull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Function;
-import com.google.common.base.Functions;
-
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemId;
import net.shibboleth.metadata.pipeline.MultiOutputSerializationStage.Destination;
@@ -91,7 +89,7 @@ public class FilesInDirectoryMultiOutputStrategy<T> extends AbstractInitializabl
@Nonnull private String namePrefix = "";
/** {@link Function} to use to transform the {@link Item}'s {@link ItemId}. Default: identity transform. */
- @Nonnull private Function<String, String> nameTransformer = Functions.identity();
+ @Nonnull private Function<String, String> nameTransformer = x -> x;
/** String to use as a suffix for file names generated by this strategy. Default value: empty string. */
@Nonnull private String nameSuffix = "";
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java
index 2a8dabc..d5bfccd 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java
@@ -20,12 +20,11 @@ package net.shibboleth.metadata.pipeline;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
-import com.google.common.base.Function;
-
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemId;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MDQueryMD5ItemIdTransformer.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MDQueryMD5ItemIdTransformer.java
index 0169a90..3f57a2e 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MDQueryMD5ItemIdTransformer.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MDQueryMD5ItemIdTransformer.java
@@ -17,6 +17,8 @@
package net.shibboleth.metadata.pipeline;
+import java.util.function.Function;
+
import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
@@ -24,8 +26,6 @@ import org.bouncycastle.crypto.digests.MD5Digest;
import org.cryptacular.util.CodecUtil;
import org.cryptacular.util.HashUtil;
-import com.google.common.base.Function;
-
/** Transforms a string into another string that is the MD5 hash of the original string prepended with "{md5}". */
@ThreadSafe
public class MDQueryMD5ItemIdTransformer implements Function<String, String> {
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MDQuerySHA1ItemIdTransformer.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MDQuerySHA1ItemIdTransformer.java
index 589b4a6..ab23fd0 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MDQuerySHA1ItemIdTransformer.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MDQuerySHA1ItemIdTransformer.java
@@ -17,14 +17,14 @@
package net.shibboleth.metadata.pipeline;
+import java.util.function.Function;
+
import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
import org.cryptacular.util.CodecUtil;
import org.cryptacular.util.HashUtil;
-import com.google.common.base.Function;
-
/** Transforms a string into another string that is the SHA1 hash of the original string prepended with "{sha1}". */
@ThreadSafe
public class MDQuerySHA1ItemIdTransformer implements Function<String, String> {
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
index 112cdba..cd461fd 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
@@ -23,13 +23,12 @@ import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
-import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
-
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.SimpleItemCollectionFactory;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
@@ -182,7 +181,7 @@ public class PipelineDemultiplexerStage<T> extends AbstractStage<T> {
selectedItems = collectionFactory.get();
for (final Item<T> item : itemCollection) {
- if (selectionStrategy.apply(item)) {
+ if (selectionStrategy.test(item)) {
// @SuppressWarnings("unchecked") final ItemType copied = (ItemType) item.copy();
// selectedItems.add(copied);
selectedItems.add(item.copy());
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
index 41caf26..5682a17 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
@@ -23,12 +23,11 @@ import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
+import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
-import com.google.common.base.Supplier;
-
import net.shibboleth.metadata.CollectionMergeStrategy;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.SimpleCollectionMergeStrategy;
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
index 965f835..230dac8 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
@@ -22,6 +22,8 @@ import java.util.Collection;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -39,10 +41,6 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.base.Supplier;
-
/**
* A stage which splits a given collection and passes selected items to one pipeline and non-selected items to another.
* The selected and non-selected item pipelines are executed via the set {@link ExecutorService} and operate on
@@ -78,7 +76,7 @@ public class SplitMergeStage<T> extends AbstractStage<T> {
private Supplier<Collection<Item<T>>> collectionFactory = new SimpleItemCollectionFactory<>();
/** Strategy used to split the given item collection. */
- private Predicate<Item<T>> selectionStrategy = Predicates.alwaysFalse();
+ private Predicate<Item<T>> selectionStrategy = x -> false;
/** Pipeline that receives the selected items. */
private Pipeline<T> selectedItemPipeline;
@@ -227,7 +225,7 @@ public class SplitMergeStage<T> extends AbstractStage<T> {
continue;
}
- if (selectionStrategy.apply(item)) {
+ if (selectionStrategy.test(item)) {
selectedItems.add(item);
} else {
nonselectedItems.add(item);
@@ -301,4 +299,4 @@ public class SplitMergeStage<T> extends AbstractStage<T> {
nonselectedItemPipeline.initialize();
}
}
-}
\ No newline at end of file
+}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/PathSegmentStringTransformer.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/PathSegmentStringTransformer.java
index fe153e7..7b7fd83 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/PathSegmentStringTransformer.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/PathSegmentStringTransformer.java
@@ -17,9 +17,10 @@
package net.shibboleth.metadata.util;
+import java.util.function.Function;
+
import javax.annotation.Nonnull;
-import com.google.common.base.Function;
import com.google.common.net.UrlEscapers;
/**
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/SHA1StringTransformer.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/SHA1StringTransformer.java
index 5c37169..063871d 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/SHA1StringTransformer.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/SHA1StringTransformer.java
@@ -17,13 +17,13 @@
package net.shibboleth.metadata.util;
+import java.util.function.Function;
+
import javax.annotation.Nonnull;
import org.cryptacular.util.CodecUtil;
import org.cryptacular.util.HashUtil;
-import com.google.common.base.Function;
-
/**
* A {@link Function} that transforms a {@link String} into a hex-encoded representation of
* the SHA-1 digest of the string.
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ContainerTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ContainerTest.java
index bc2ac4d..5c7fb9b 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ContainerTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ContainerTest.java
@@ -2,16 +2,14 @@
package net.shibboleth.metadata.dom;
import java.util.List;
+import java.util.function.Function;
+import java.util.function.Predicate;
import org.testng.Assert;
import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-
public class ContainerTest extends BaseDOMTest {
private final Document doc;
@@ -37,7 +35,7 @@ public class ContainerTest extends BaseDOMTest {
// an indented container
final Element e2 = doc.createElementNS("ns", "el2");
e1.insertBefore(e2, e1.getFirstChild());
- final Container c2 = c1.findChild(Predicates.<Element>alwaysTrue());
+ final Container c2 = c1.findChild(x -> true);
Assert.assertNotNull(c2);
c2.prime();
Assert.assertEquals(e2.getTextContent(), "\n ");
@@ -190,7 +188,7 @@ public class ContainerTest extends BaseDOMTest {
final Container child = root.findChild(new Predicate<Element>(){
@Override
- public boolean apply(Element input) {
+ public boolean test(Element input) {
return "findme".equals(input.getLocalName());
}
@@ -205,7 +203,7 @@ public class ContainerTest extends BaseDOMTest {
final List<Container> children = root.findChildren(new Predicate<Element>(){
@Override
- public boolean apply(Element input) {
+ public boolean test(Element input) {
return "findme".equals(input.getLocalName());
}
@@ -225,7 +223,7 @@ public class ContainerTest extends BaseDOMTest {
c1.locateChild(new Predicate<Element>(){
@Override
- public boolean apply(Element input) {
+ public boolean test(Element input) {
return "child".equals(input.getLocalName());
}
@@ -249,7 +247,7 @@ public class ContainerTest extends BaseDOMTest {
c1.locateChild(new Predicate<Element>(){
@Override
- public boolean apply(Element input) {
+ public boolean test(Element input) {
return "child".equals(input.getLocalName());
}
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementMakerTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementMakerTest.java
index 8b0f210..7a82c73 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementMakerTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementMakerTest.java
@@ -1,6 +1,8 @@
package net.shibboleth.metadata.dom;
+import java.util.function.Function;
+
import javax.xml.namespace.QName;
import org.testng.Assert;
@@ -8,8 +10,6 @@ import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import com.google.common.base.Function;
-
public class ElementMakerTest extends BaseDOMTest {
private final Document doc;
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementMatcherTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementMatcherTest.java
index 371c789..2345209 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementMatcherTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementMatcherTest.java
@@ -6,9 +6,6 @@ import javax.xml.namespace.QName;
import org.testng.Assert;
import org.testng.annotations.Test;
import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import com.google.common.base.Predicate;
public class ElementMatcherTest extends BaseDOMTest {
@@ -22,11 +19,11 @@ public class ElementMatcherTest extends BaseDOMTest {
@Test
public void matcher() throws Exception {
- final Predicate<Element> matcher = new ElementMatcher(new QName("ns", "xxx"));
- Assert.assertTrue(matcher.apply(doc.createElementNS("ns", "xxx")));
- Assert.assertFalse(matcher.apply(doc.createElementNS("ns", "yyy")));
- Assert.assertFalse(matcher.apply(doc.createElementNS("ns2", "xxx")));
- Assert.assertFalse(matcher.apply(doc.createElementNS("ns2", "yyy")));
+ final var matcher = new ElementMatcher(new QName("ns", "xxx"));
+ Assert.assertTrue(matcher.test(doc.createElementNS("ns", "xxx")));
+ Assert.assertFalse(matcher.test(doc.createElementNS("ns", "yyy")));
+ Assert.assertFalse(matcher.test(doc.createElementNS("ns2", "xxx")));
+ Assert.assertFalse(matcher.test(doc.createElementNS("ns2", "yyy")));
}
}
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategyTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategyTest.java
index 6366d47..848c58b 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategyTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategyTest.java
@@ -52,9 +52,9 @@ public class XPathItemSelectionStrategyTest extends BaseDOMTest {
DOMElementItem item2 = new DOMElementItem(readXMLData("2.xml"));
DOMElementItem item3 = new DOMElementItem(readXMLData("3.xml"));
- Assert.assertTrue(strategy.apply(item1));
- Assert.assertFalse(strategy.apply(item2));
- Assert.assertTrue(strategy.apply(item3));
+ Assert.assertTrue(strategy.test(item1));
+ Assert.assertFalse(strategy.test(item2));
+ Assert.assertTrue(strategy.test(item3));
}
}
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMakerTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMakerTest.java
index 0de81a0..29c4ac5 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMakerTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMakerTest.java
@@ -8,8 +8,6 @@ import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import com.google.common.base.Function;
-
import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.Container;
@@ -25,7 +23,7 @@ public class AttributeElementMakerTest extends BaseDOMTest {
@Test
public void apply() {
- final Function<Container, Element> maker = new AttributeElementMaker("name", "nameFormat");
+ final var maker = new AttributeElementMaker("name", "nameFormat");
final Element root = doc.createElementNS("ns", "root");
final Container rootContainer = new Container(root);
final Element newElement = maker.apply(rootContainer);
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcherTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcherTest.java
index 7b43506..9d94b43 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcherTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcherTest.java
@@ -7,8 +7,6 @@ import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import com.google.common.base.Predicate;
-
import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
@@ -30,27 +28,27 @@ public class AttributeElementMatcherTest extends BaseDOMTest {
@Test
public void matchNormal() throws Exception {
- final Predicate<Element> matcher1 = new AttributeElementMatcher("name", "name-format");
+ final var matcher1 = new AttributeElementMatcher("name", "name-format");
attr.setAttribute("Name", "name");
attr.setAttribute("NameFormat", "name-format");
- Assert.assertTrue(matcher1.apply(attr));
+ Assert.assertTrue(matcher1.test(attr));
- final Predicate<Element> matcher2 = new AttributeElementMatcher("name2", "name-format");
- Assert.assertFalse(matcher2.apply(attr));
+ final var matcher2 = new AttributeElementMatcher("name2", "name-format");
+ Assert.assertFalse(matcher2.test(attr));
- final Predicate<Element> matcher3 = new AttributeElementMatcher("name", "name-format2");
- Assert.assertFalse(matcher3.apply(attr));
+ final var matcher3 = new AttributeElementMatcher("name", "name-format2");
+ Assert.assertFalse(matcher3.test(attr));
}
@Test
public void matchDefaultFormat() throws Exception {
attr.setAttribute("Name", "name");
- final Predicate<Element> matcher1 = new AttributeElementMatcher("name", SAMLSupport.ATTRNAME_FORMAT_UNSPECIFIED);
- Assert.assertTrue(matcher1.apply(attr));
+ final var matcher1 = new AttributeElementMatcher("name", SAMLSupport.ATTRNAME_FORMAT_UNSPECIFIED);
+ Assert.assertTrue(matcher1.test(attr));
- final Predicate<Element> matcher2 = new AttributeElementMatcher("name2", SAMLSupport.ATTRNAME_FORMAT_UNSPECIFIED);
- Assert.assertFalse(matcher2.apply(attr));
+ final var matcher2 = new AttributeElementMatcher("name2", SAMLSupport.ATTRNAME_FORMAT_UNSPECIFIED);
+ Assert.assertFalse(matcher2.test(attr));
}
}
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMakerTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMakerTest.java
index b9f3ad0..5e79b5a 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMakerTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMakerTest.java
@@ -6,8 +6,6 @@ import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import com.google.common.base.Function;
-
import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.metadata.dom.Container;
@@ -23,7 +21,7 @@ public class AttributeValueElementMakerTest extends BaseDOMTest {
@Test
public void apply() {
- final Function<Container, Element> maker = new AttributeValueElementMaker("value text");
+ final var maker = new AttributeValueElementMaker("value text");
final Element root = doc.createElementNS("ns", "root");
final Container rootContainer = new Container(root);
final Element newElement = maker.apply(rootContainer);
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcherTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcherTest.java
index 95a0228..1237275 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcherTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcherTest.java
@@ -7,8 +7,6 @@ import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import com.google.common.base.Predicate;
-
import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
@@ -30,21 +28,21 @@ public class AttributeValueElementMatcherTest extends BaseDOMTest {
@Test
public void apply() throws Exception {
- final Predicate<Element> matcher1 = new AttributeValueElementMatcher("value");
+ final var matcher1 = new AttributeValueElementMatcher("value");
value.setTextContent("value");
- Assert.assertTrue(matcher1.apply(value));
+ Assert.assertTrue(matcher1.test(value));
value.setTextContent("other");
- Assert.assertFalse(matcher1.apply(value));
+ Assert.assertFalse(matcher1.test(value));
- final Predicate<Element> matcher2 = new AttributeValueElementMatcher("other");
+ final var matcher2 = new AttributeValueElementMatcher("other");
value.setTextContent("value");
- Assert.assertFalse(matcher2.apply(value));
+ Assert.assertFalse(matcher2.test(value));
value.setTextContent("other");
- Assert.assertTrue(matcher2.apply(value));
+ Assert.assertTrue(matcher2.test(value));
}
}
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherSpringTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherSpringTest.java
index 03e9c38..a812cd7 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherSpringTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherSpringTest.java
@@ -17,13 +17,13 @@
package net.shibboleth.metadata.dom.saml.mdattr;
+import java.util.function.Predicate;
+
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.base.Predicate;
-
import net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage.EntityAttributeContext;
import net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage.ContextImpl;
@@ -43,8 +43,8 @@ public class AssuranceCertificationMatcherSpringTest extends AbstractTestNGSprin
final Predicate<EntityAttributeContext> matcher,
final Predicate<EntityAttributeContext> oldMatcher,
final EntityAttributeContext context) {
- Assert.assertEquals(matcher.apply(context), expected, context.toString());
- Assert.assertEquals(oldMatcher.apply(context), expected, context.toString());
+ Assert.assertEquals(matcher.test(context), expected, context.toString());
+ Assert.assertEquals(oldMatcher.test(context), expected, context.toString());
}
@Test
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherTest.java
index 1a87a0a..ba3a4e9 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherTest.java
@@ -17,11 +17,11 @@
package net.shibboleth.metadata.dom.saml.mdattr;
+import java.util.function.Predicate;
+
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.base.Predicate;
-
import net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage.EntityAttributeContext;
import net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage.ContextImpl;
@@ -29,7 +29,7 @@ public class AssuranceCertificationMatcherTest {
private void test(final boolean expected, final Predicate<EntityAttributeContext> matcher,
final EntityAttributeContext context) {
- Assert.assertEquals(matcher.apply(context), expected, context.toString());
+ Assert.assertEquals(matcher.test(context), expected, context.toString());
}
@Test
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStageTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStageTest.java
index 1251185..d86398e 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStageTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStageTest.java
@@ -20,6 +20,7 @@ package net.shibboleth.metadata.dom.saml.mdattr;
import java.util.ArrayList;
import java.util.List;
+import java.util.function.Predicate;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.WarningStatus;
@@ -33,9 +34,6 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import org.w3c.dom.Element;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-
public class EntityAttributeFilteringStageTest extends BaseDOMTest {
protected EntityAttributeFilteringStageTest() {
@@ -159,7 +157,7 @@ public class EntityAttributeFilteringStageTest extends BaseDOMTest {
public void testKeepEverything() throws Exception {
final List<Item<Element>> items = makeInputItems();
final List<Predicate<EntityAttributeContext>> rules = new ArrayList<>();
- rules.add(Predicates.<EntityAttributeContext>alwaysTrue());
+ rules.add(x -> true);
final EntityAttributeFilteringStage stage = new EntityAttributeFilteringStage();
stage.setId("id");
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherSpringTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherSpringTest.java
index 7d3d09a..319495a 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherSpringTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherSpringTest.java
@@ -18,13 +18,13 @@
package net.shibboleth.metadata.dom.saml.mdattr;
+import java.util.function.Predicate;
+
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.base.Predicate;
-
import net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage.EntityAttributeContext;
import net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage.ContextImpl;
@@ -39,7 +39,7 @@ public class EntityCategoryMatcherSpringTest extends AbstractTestNGSpringContext
private void test(final boolean expected, final Predicate<EntityAttributeContext> matcher,
final EntityAttributeContext context) {
- Assert.assertEquals(matcher.apply(context), expected, context.toString());
+ Assert.assertEquals(matcher.test(context), expected, context.toString());
}
@Test
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherTest.java
index 3a7e6a9..32b6ace 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherTest.java
@@ -18,11 +18,11 @@
package net.shibboleth.metadata.dom.saml.mdattr;
+import java.util.function.Predicate;
+
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.base.Predicate;
-
import net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage.EntityAttributeContext;
import net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage.ContextImpl;
@@ -30,7 +30,7 @@ public class EntityCategoryMatcherTest {
private void test(final boolean expected, final Predicate<EntityAttributeContext> matcher,
final EntityAttributeContext context) {
- Assert.assertEquals(matcher.apply(context), expected, context.toString());
+ Assert.assertEquals(matcher.test(context), expected, context.toString());
}
@Test
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategorySupportMatcherTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategorySupportMatcherTest.java
index b95028c..72cca6a 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategorySupportMatcherTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategorySupportMatcherTest.java
@@ -18,11 +18,11 @@
package net.shibboleth.metadata.dom.saml.mdattr;
+import java.util.function.Predicate;
+
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.base.Predicate;
-
import net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage.EntityAttributeContext;
import net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage.ContextImpl;
@@ -30,7 +30,7 @@ public class EntityCategorySupportMatcherTest {
private void test(final boolean expected, final Predicate<EntityAttributeContext> matcher,
final EntityAttributeContext context) {
- Assert.assertEquals(matcher.apply(context), expected, context.toString());
+ Assert.assertEquals(matcher.test(context), expected, context.toString());
}
@Test
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/MultiPredicateMatcherTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/MultiPredicateMatcherTest.java
index 9ccd01f..826660a 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/MultiPredicateMatcherTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/MultiPredicateMatcherTest.java
@@ -18,14 +18,13 @@
package net.shibboleth.metadata.dom.saml.mdattr;
+import java.util.function.Predicate;
+
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-
-import net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage.EntityAttributeContext;
import net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage.ContextImpl;
+import net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage.EntityAttributeContext;
public class MultiPredicateMatcherTest {
@@ -35,43 +34,43 @@ public class MultiPredicateMatcherTest {
@Test
public void testNothing() {
final Predicate<EntityAttributeContext> matcher = new MultiPredicateMatcher();
- Assert.assertTrue(matcher.apply(context));
+ Assert.assertTrue(matcher.test(context));
}
@Test
public void setNameFormatPredicate() {
final MultiPredicateMatcher matcher = new MultiPredicateMatcher();
- matcher.setNameFormatPredicate(Predicates.containsPattern("tfm"));
- Assert.assertTrue(matcher.apply(context));
- matcher.setNameFormatPredicate(Predicates.containsPattern("xxx"));
- Assert.assertFalse(matcher.apply(context));
+ matcher.setNameFormatPredicate(x -> x.toString().contains("tfm"));
+ Assert.assertTrue(matcher.test(context));
+ matcher.setNameFormatPredicate(x -> x.toString().contains("xxx"));
+ Assert.assertFalse(matcher.test(context));
}
@Test
public void setNamePredicate() {
final MultiPredicateMatcher matcher = new MultiPredicateMatcher();
- matcher.setNamePredicate(Predicates.containsPattern("ena"));
- Assert.assertTrue(matcher.apply(context));
- matcher.setNamePredicate(Predicates.containsPattern("xxx"));
- Assert.assertFalse(matcher.apply(context));
+ matcher.setNamePredicate(x -> x.toString().contains("ena"));
+ Assert.assertTrue(matcher.test(context));
+ matcher.setNamePredicate(x -> x.toString().contains("xxx"));
+ Assert.assertFalse(matcher.test(context));
}
@Test
public void setRegistrationAuthorityPredicate() {
final MultiPredicateMatcher matcher = new MultiPredicateMatcher();
- matcher.setRegistrationAuthorityPredicate(Predicates.containsPattern("egr"));
- Assert.assertTrue(matcher.apply(context));
- matcher.setRegistrationAuthorityPredicate(Predicates.containsPattern("xxx"));
- Assert.assertFalse(matcher.apply(context));
+ matcher.setRegistrationAuthorityPredicate(x -> x.toString().contains("egr"));
+ Assert.assertTrue(matcher.test(context));
+ matcher.setRegistrationAuthorityPredicate(x -> x.toString().contains("xxx"));
+ Assert.assertFalse(matcher.test(context));
}
@Test
public void setValuePredicate() {
final MultiPredicateMatcher matcher = new MultiPredicateMatcher();
- matcher.setValuePredicate(Predicates.containsPattern("eva"));
- Assert.assertTrue(matcher.apply(context));
- matcher.setValuePredicate(Predicates.containsPattern("xxx"));
- Assert.assertFalse(matcher.apply(context));
+ matcher.setValuePredicate(x -> x.toString().contains("eva"));
+ Assert.assertTrue(matcher.test(context));
+ matcher.setValuePredicate(x -> x.toString().contains("xxx"));
+ Assert.assertFalse(matcher.test(context));
}
}
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/RegistrationAuthorityMatcherTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/RegistrationAuthorityMatcherTest.java
index b429f98..d58a74f 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/RegistrationAuthorityMatcherTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/RegistrationAuthorityMatcherTest.java
@@ -18,11 +18,11 @@
package net.shibboleth.metadata.dom.saml.mdattr;
+import java.util.function.Predicate;
+
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.base.Predicate;
-
import net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage.EntityAttributeContext;
import net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage.ContextImpl;
@@ -30,7 +30,7 @@ public class RegistrationAuthorityMatcherTest {
private void test(final boolean expected, final Predicate<EntityAttributeContext> matcher,
final EntityAttributeContext context) {
- Assert.assertEquals(matcher.apply(context), expected, context.toString());
+ Assert.assertEquals(matcher.test(context), expected, context.toString());
}
@Test
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/AbstractStageTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/AbstractStageTest.java
index 3a27038..8fbc816 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/AbstractStageTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/AbstractStageTest.java
@@ -21,6 +21,7 @@ package net.shibboleth.metadata.pipeline;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.function.Predicate;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.MockItem;
@@ -28,19 +29,16 @@ import net.shibboleth.metadata.MockItem;
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-
public class AbstractStageTest {
@Test
public void getSetCollectionPredicate() {
final CountingStage<String> c = new CountingStage<>();
- final Predicate<Collection<Item<String>>> pred = c.getCollectionPredicate();
+ final var pred = c.getCollectionPredicate();
final List<Item<String>> list = new ArrayList<>();
- Assert.assertTrue(pred.apply(list));
+ Assert.assertTrue(pred.test(list));
- final Predicate<Collection<Item<String>>> pred2 = Predicates.alwaysFalse();
+ final Predicate<Collection<Item<String>>> pred2 = x -> false;
Assert.assertNotSame(pred, pred2);
c.setCollectionPredicate(pred2);
Assert.assertSame(c.getCollectionPredicate(), pred2);
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/AtLeastCollectionPredicateTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/AtLeastCollectionPredicateTest.java
index a4b93cc..9d4a59a 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/AtLeastCollectionPredicateTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/AtLeastCollectionPredicateTest.java
@@ -32,11 +32,11 @@ public class AtLeastCollectionPredicateTest {
Assert.assertEquals(pred.getMinimum(), 0);
final Collection<String> empty = new ArrayList<>();
- Assert.assertTrue(pred.apply(empty));
+ Assert.assertTrue(pred.test(empty));
final Collection<String> single = new ArrayList<>();
single.add("single");
- Assert.assertTrue(pred.apply(single));
+ Assert.assertTrue(pred.test(single));
}
@Test
@@ -46,11 +46,11 @@ public class AtLeastCollectionPredicateTest {
Assert.assertEquals(pred.getMinimum(), 1);
final Collection<String> empty = new ArrayList<>();
- Assert.assertFalse(pred.apply(empty));
+ Assert.assertFalse(pred.test(empty));
final Collection<String> single = new ArrayList<>();
single.add("single");
- Assert.assertTrue(pred.apply(single));
+ Assert.assertTrue(pred.test(single));
}
}
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategyTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategyTest.java
index 22e9cc7..bcae44e 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategyTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategyTest.java
@@ -20,11 +20,11 @@ package net.shibboleth.metadata.pipeline;
import java.io.File;
import java.io.OutputStream;
+import java.util.function.Function;
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.base.Function;
import com.google.common.io.Files;
import net.shibboleth.metadata.Item;
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemIdTransformStageTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemIdTransformStageTest.java
index 29ee955..7cacdeb 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemIdTransformStageTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemIdTransformStageTest.java
@@ -19,12 +19,11 @@ package net.shibboleth.metadata.pipeline;
import java.util.ArrayList;
import java.util.List;
+import java.util.function.Function;
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.base.Function;
-
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemId;
import net.shibboleth.metadata.MockItem;
@@ -83,4 +82,4 @@ public class ItemIdTransformStageTest {
Assert.assertTrue(sha1Match);
Assert.assertTrue(md5Match);
}
-}
\ No newline at end of file
+}
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java
index c28fbaa..2a9bc5a 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java
@@ -22,6 +22,7 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.function.Predicate;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.MockItem;
@@ -32,9 +33,6 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-
/** Unit test of {@link PipelineDemultiplexerStage}. */
public class PipelineDemultiplexerStageTest {
@@ -78,7 +76,7 @@ public class PipelineDemultiplexerStageTest {
stage = new PipelineDemultiplexerStage<>();
stage.setId("test");
stage.setPipelineAndSelectionStrategies(Collections.singletonList(new Pair<Pipeline<String>, Predicate<Item<String>>>(pipeline,
- Predicates.<Item<String>>alwaysTrue())));
+ x -> true)));
stage.initialize();
Assert.assertNotNull(stage.getCollectionFactory());
Assert.assertNotNull(stage.getExecutorService());
@@ -108,7 +106,7 @@ public class PipelineDemultiplexerStageTest {
stage.setId("test");
stage.setWaitingForPipelines(true);
stage.setPipelineAndSelectionStrategies(Collections.singletonList(new Pair<Pipeline<String>, Predicate<Item<String>>>(pipeline,
- Predicates.<Item<String>>alwaysTrue())));
+ x -> true)));
stage.initialize();
stage.execute(items);
@@ -131,7 +129,7 @@ public class PipelineDemultiplexerStageTest {
stage.setId("test");
stage.setWaitingForPipelines(true);
stage.setPipelineAndSelectionStrategies(Collections.singletonList(new Pair<Pipeline<String>, Predicate<Item<String>>>(pipeline,
- Predicates.<Item<String>>alwaysTrue())));
+ x -> true)));
stage.initialize();
try {
@@ -146,4 +144,5 @@ public class PipelineDemultiplexerStageTest {
final PipelineDemultiplexerStage<String> stage = new PipelineDemultiplexerStage<>();
Assert.assertTrue(stage.isWaitingForPipelines());
}
-}
\ No newline at end of file
+
+}
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java
index f62b571..db102c7 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java
@@ -22,6 +22,7 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.function.Predicate;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.MockItem;
@@ -31,9 +32,6 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-
/** Unit test of {@link SplitMergeStage}. */
public class SplitMergeStageTest {
@@ -72,8 +70,9 @@ public class SplitMergeStageTest {
@Test public void testSelectionStrategy() {
SplitMergeStage<Object> stage = new SplitMergeStage<>();
- stage.setSelectionStrategy(Predicates.<Item<Object>>alwaysTrue());
- Assert.assertEquals(stage.getSelectionStrategy(), Predicates.alwaysTrue());
+ final Predicate<Item<Object>> pred = x -> true;
+ stage.setSelectionStrategy(pred);
+ Assert.assertEquals(stage.getSelectionStrategy(), pred);
}
@Test public void testInitialization() throws Exception {
@@ -86,7 +85,7 @@ public class SplitMergeStageTest {
stage.setId("test");
stage.setNonselectedItemPipeline(pipeline);
stage.setSelectedItemPipeline(pipeline);
- stage.setSelectionStrategy(Predicates.<Item<Object>>alwaysTrue());
+ stage.setSelectionStrategy(x -> true);
stage.initialize();
Assert.assertNotNull(stage.getCollectionFactory());
Assert.assertNotNull(stage.getExecutorService());
@@ -94,19 +93,19 @@ public class SplitMergeStageTest {
stage = new SplitMergeStage<>();
stage.setId("test");
stage.setSelectedItemPipeline(pipeline);
- stage.setSelectionStrategy(Predicates.<Item<Object>>alwaysTrue());
+ stage.setSelectionStrategy(x -> true);
stage.initialize();
stage = new SplitMergeStage<>();
stage.setId("test");
stage.setNonselectedItemPipeline(pipeline);
- stage.setSelectionStrategy(Predicates.<Item<Object>>alwaysTrue());
+ stage.setSelectionStrategy(x -> true);
stage.initialize();
try {
stage = new SplitMergeStage<>();
stage.setId("test");
- stage.setSelectionStrategy(Predicates.<Item<Object>>alwaysTrue());
+ stage.setSelectionStrategy(x -> true);
stage.initialize();
Assert.fail();
} catch (ComponentInitializationException e) {
@@ -135,7 +134,7 @@ public class SplitMergeStageTest {
SplitMergeStage<String> stage = new SplitMergeStage<>();
stage.setId("test");
- stage.setSelectionStrategy(Predicates.<Item<String>>alwaysTrue());
+ stage.setSelectionStrategy(x -> true);
stage.setNonselectedItemPipeline(nonselectedPipeline);
stage.setSelectedItemPipeline(selectedPipeline);
stage.initialize();
@@ -178,7 +177,7 @@ public class SplitMergeStageTest {
SplitMergeStage<String> stage = new SplitMergeStage<>();
stage.setId("test");
- stage.setSelectionStrategy(Predicates.<Item<String>>alwaysTrue());
+ stage.setSelectionStrategy(x -> true);
stage.setNonselectedItemPipeline(nonselectedPipeline);
stage.setSelectedItemPipeline(selectedPipeline);
stage.initialize();
@@ -217,7 +216,7 @@ public class SplitMergeStageTest {
final SplitMergeStage<String> stage = new SplitMergeStage<>();
stage.setId("test");
- stage.setSelectionStrategy(Predicates.<Item<String>>alwaysTrue());
+ stage.setSelectionStrategy(x -> true);
stage.setNonselectedItemPipeline(nonselectedPipeline);
stage.setSelectedItemPipeline(selectedPipeline);
stage.initialize();
@@ -249,7 +248,7 @@ public class SplitMergeStageTest {
stage.setId("test");
stage.setSelectionStrategy(new Predicate<Item<String>>(){
@Override
- public boolean apply(Item<String> input) {
+ public boolean test(Item<String> input) {
return input.unwrap().equals("one");
}
@@ -280,7 +279,7 @@ public class SplitMergeStageTest {
stage.setId("test");
stage.setSelectionStrategy(new Predicate<Item<String>>(){
@Override
- public boolean apply(Item<String> input) {
+ public boolean test(Item<String> input) {
return input.unwrap().equals("one");
}
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/util/PathSegmentStringTransformerTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/util/PathSegmentStringTransformerTest.java
index 5a2aab2..6c8dd75 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/util/PathSegmentStringTransformerTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/util/PathSegmentStringTransformerTest.java
@@ -18,11 +18,11 @@
package net.shibboleth.metadata.util;
+import java.util.function.Function;
+
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.base.Function;
-
public class PathSegmentStringTransformerTest {
private static final Function<String, String> transform =
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/util/SHA1StringTransformerTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/util/SHA1StringTransformerTest.java
index 8b3b182..f96322c 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/util/SHA1StringTransformerTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/util/SHA1StringTransformerTest.java
@@ -18,11 +18,11 @@
package net.shibboleth.metadata.util;
+import java.util.function.Function;
+
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.base.Function;
-
public class SHA1StringTransformerTest {
private static final Function<String, String> transform =
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list