[java-shib-shared] branch main updated: Rename logic package.
Scott Cantor
cantor.2 at osu.edu
Mon Sep 26 21:17:32 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-shared.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=b088e3640535e9d878f55f7ed42730807b5b28b1
The following commit(s) were added to refs/heads/main by this push:
new b088e364 Rename logic package.
b088e364 is described below
commit b088e3640535e9d878f55f7ed42730807b5b28b1
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 26 17:17:29 2022 -0400
Rename logic package.
---
.../shibboleth/shared/cli/AbstractCommandLine.java | 2 +-
.../resource/FileBackedHTTPResource.java | 2 +-
.../spring/httpclient/resource/HTTPResource.java | 2 +-
.../httpclient/resource/RepositorySupport.java | 2 +-
.../httpclient/ContextHandlingHttpClient.java | 2 +-
.../httpclient/FileCachingHttpClientBuilder.java | 2 +-
.../shared/httpclient/HttpClientBuilder.java | 2 +-
.../shared/httpclient/HttpClientSupport.java | 2 +-
.../shared/httpclient/IdleConnectionSweeper.java | 2 +-
.../InMemoryCachingHttpClientBuilder.java | 4 +-
.../shared/httpclient/TLSSocketFactory.java | 2 +-
.../net/shibboleth/shared/net/CookieManager.java | 2 +-
.../shared/net/SimpleURLCanonicalizer.java | 2 +-
.../impl/HttpServletRequestResponseContext.java | 2 +-
.../impl/ThreadLocalHttpServletRequestProxy.java | 2 +-
.../ThreadLocalHttpServletRequestSupplier.java | 2 +-
.../impl/ThreadLocalHttpServletResponseProxy.java | 2 +-
.../ThreadLocalHttpServletResponseSupplier.java | 2 +-
.../support/net/SameSiteCookieHeaderFilter.java | 2 +-
.../shared/httpclient/HttpClientBuilderTest.java | 2 +-
.../ThreadLocalHttpServletRequestProxyTest.java | 3 +-
.../ThreadLocalHttpServletResponseProxyTest.java | 3 +-
.../security/factory/KeyStoreFactoryBean.java | 2 +-
.../security/factory/PrivateKeyFactoryBean.java | 2 +-
.../security/factory/PublicKeyFactoryBean.java | 4 +-
.../factory/X509CertificateChainFactoryBean.java | 4 +-
.../factory/X509CertificateFactoryBean.java | 4 +-
.../net/shibboleth/shared/security/DataSealer.java | 4 +-
.../security/impl/BasicKeystoreKeyStrategy.java | 4 +-
.../impl/BasicKeystoreKeyStrategyTool.java | 2 +-
.../FixedStringIdentifierGenerationStrategy.java | 2 +-
.../shared/security/impl/IPRangeAccessControl.java | 2 +-
.../impl/RandomIdentifierGenerationStrategy.java | 2 +-
.../shared/security/impl/ScriptedKeyStrategy.java | 2 +-
.../impl/SelfSignedCertificateGenerator.java | 2 +-
.../shibboleth/shared/security/DataSealerTest.java | 2 +-
.../shared/security/TestResourceConverter.java | 4 +-
.../shared/service/AbstractReloadableService.java | 2 +-
.../shared/service/ReloadableServiceGaugeSet.java | 2 +-
.../shared/service/impl/LogbackLoggingService.java | 2 +-
.../service/reloadable/ProxiedFactoryBean.java | 2 +-
.../shared/service/reloadable/ReloadableScope.java | 2 +-
.../impl/DelegatingAccessControlService.java | 2 +-
.../impl/ReloadingAccessControlService.java | 2 +-
.../impl/ServiceableAccessControlService.java | 2 +-
.../ApplicationContextServiceableComponent.java | 2 +-
.../spring/service/ClassBasedServiceStrategy.java | 2 +-
.../spring/service/ReloadableSpringService.java | 2 +-
...actPropertiesApplicationContextInitializer.java | 4 +-
.../FileSystemXmlWebApplicationContext.java | 2 +-
.../spring/custom/SecondaryNamespaceHandler.java | 2 +-
.../AbstractSpringExpressionEvaluator.java | 2 +-
.../spring/factory/DOMDocumentFactoryBean.java | 2 +-
.../shared/spring/factory/PatternFactoryBean.java | 2 +-
.../spring/resource/ConditionalResource.java | 2 +-
.../resource/PreferFileSystemResourceLoader.java | 2 +-
.../shared/spring/resource/ResourceHelper.java | 2 +-
.../resource/RunnableFileSystemResource.java | 2 +-
.../spring/util/ApplicationContextBuilder.java | 2 +-
.../shared/spring/util/SpringSupport.java | 2 +-
.../net/shibboleth/shared/codec/Base32Support.java | 2 +-
.../net/shibboleth/shared/codec/Base64Support.java | 2 +-
.../shibboleth/shared/codec/StringDigester.java | 2 +-
.../shared/collection/ClassIndexedSet.java | 2 +-
.../shared/collection/ClassToInstanceMultiMap.java | 2 +-
.../net/shibboleth/shared/collection/Pair.java | 4 +-
.../shared/collection/ReflectionSafeIterator.java | 2 +-
.../AbstractIdentifiedInitializableComponent.java | 2 +-
.../shared/component/ComponentSupport.java | 2 +-
.../logic/AbstractTriStatePredicate.java | 2 +-
.../logic/AllMatchPredicate.java | 2 +-
.../logic/AnyMatchPredicate.java | 2 +-
.../logic/BiFunctionSupport.java | 2 +-
.../logic/BiPredicateSupport.java | 2 +-
.../logic/CaseInsensitiveStringMatchPredicate.java | 2 +-
.../java/support => shared}/logic/Constraint.java | 2 +-
.../logic/ConstraintViolationException.java | 2 +-
.../support => shared}/logic/FunctionSupport.java | 9 +--
.../logic/PredicateDrivenFunction.java | 2 +-
.../support => shared}/logic/PredicateSupport.java | 2 +-
.../support => shared}/logic/RegexPredicate.java | 2 +-
.../logic/ScriptedBiConsumer.java | 2 +-
.../logic/ScriptedBiFunction.java | 2 +-
.../logic/ScriptedBiPredicate.java | 2 +-
.../support => shared}/logic/ScriptedConsumer.java | 2 +-
.../support => shared}/logic/ScriptedFunction.java | 2 +-
.../logic/ScriptedPredicate.java | 2 +-
.../logic/StrategyIndirectedPredicate.java | 2 +-
.../logic/TransformAndCheckFunction.java | 7 +-
.../logic/TrimOrNullStringFunction.java | 2 +-
.../net/shibboleth/shared/logic/package-info.java} | 19 +----
.../shibboleth/shared/primitive/StringSupport.java | 4 +-
.../shibboleth/shared/primitive/TimerSupport.java | 2 +-
.../shibboleth/shared/resolver/ClassCriterion.java | 2 +-
.../resolver/CriterionPredicateRegistry.java | 2 +-
.../shared/resolver/ResolverSupport.java | 2 +-
.../shared/scripting/AbstractScriptEvaluator.java | 2 +-
.../shared/scripting/EvaluableScript.java | 4 +-
.../shared/scripting/ScriptedRunnable.java | 2 +-
.../shibboleth/shared/xml/AttributeSupport.java | 2 +-
.../net/shibboleth/shared/xml/DOMTypeSupport.java | 2 +-
.../net/shibboleth/shared/xml/ElementSupport.java | 2 +-
.../shibboleth/shared/xml/NamespaceSupport.java | 2 +-
.../net/shibboleth/shared/xml/QNameSupport.java | 2 +-
.../net/shibboleth/shared/xml/SchemaBuilder.java | 2 +-
.../shibboleth/shared/xml/SerializeSupport.java | 2 +-
.../shared/xml/impl/BasicParserPool.java | 2 +-
.../shared/xml/impl/LoggingErrorHandler.java | 2 +-
.../java/support/logic/FunctionSupport.java | 28 +++++---
.../java/support/logic/PredicateSupport.java | 84 +++++++++++-----------
.../shibboleth/shared/codec/Base32SupportTest.java | 2 +-
.../shibboleth/shared/codec/Base64SupportTest.java | 2 +-
.../shared/codec/StringDigesterTest.java | 2 +-
...stractIdentifiedInitializableComponentTest.java | 4 +-
.../shared/component/ComponentSupportTest.java | 4 +-
.../logic/AllMatchPredicateTest.java | 5 +-
.../logic/AnyMatchPredicateTest.java | 6 +-
.../CaseInsensitiveStringMatchPredicateTest.java | 6 +-
.../ComponentInitializationExceptionFunction.java | 5 +-
.../ComponentInitializationExceptionPredicate.java | 2 +-
.../logic/ExceptionFunction.java | 9 ++-
.../logic/ExceptionPredicate.java | 3 +-
.../support => shared}/logic/ScriptedTest.java | 2 +-
.../logic/TransformAndCheckFunctionTest.java | 2 +-
.../logic/TrimOrNullStringFunctionTest.java | 3 +-
.../shared/primitive/StringSupportTest.java | 2 +-
.../shared/scripting/EvaluableScriptTest.java | 2 +-
.../shared/xml/AttributeSupportTest.java | 2 +-
.../shibboleth/shared/xml/ElementSupportTest.java | 2 +-
.../shibboleth/shared/xml/QNameSupportTest.java | 2 +-
.../shared/xml/TestResourceConverter.java | 4 +-
.../shared/xml/impl/BasicParserPoolTest.java | 2 +-
.../shared/testing/RepositorySupport.java | 2 +-
.../net/shibboleth/shared/velocity/Template.java | 2 +-
134 files changed, 234 insertions(+), 224 deletions(-)
diff --git a/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLine.java b/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLine.java
index 6959af24..c729196e 100644
--- a/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLine.java
+++ b/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLine.java
@@ -41,10 +41,10 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.annotation.constraint.NotLive;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.spring.context.FilesystemGenericApplicationContext;
import net.shibboleth.shared.spring.resource.PreferFileSystemResourceLoader;
import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* A simple driver for a Spring-based CLI.
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResource.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResource.java
index d1064c69..a91aff5f 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResource.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResource.java
@@ -28,7 +28,7 @@ import javax.annotation.Nonnull;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResource.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResource.java
index fbbc44f7..97b8240f 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResource.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResource.java
@@ -52,8 +52,8 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.AbstractIdentifiedInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.httpclient.HttpClientContextHandler;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* Resource for looking up HTTP URLs. Allows injection and therefore configuration of an Apache {@link HttpClient}. Code
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/RepositorySupport.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/RepositorySupport.java
index 3137c6f3..47a35117 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/RepositorySupport.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/RepositorySupport.java
@@ -20,8 +20,8 @@ package net.shibboleth.shared.spring.httpclient.resource;
import javax.annotation.Nonnull;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* Support class for working with the project version control repository.
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClient.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClient.java
index 9e001ca5..8b5438d3 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClient.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClient.java
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.Lists;
import net.shibboleth.shared.collection.LazyList;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
/**
* A wrapper implementation of {@link HttpClient} which invokes supplied instances of {@link HttpClientContextHandler}
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java
index a71d6d4e..ffb8ccfd 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java
@@ -46,9 +46,9 @@ import net.shibboleth.shared.component.DestroyedComponentException;
import net.shibboleth.shared.component.DestructableComponent;
import net.shibboleth.shared.component.InitializableComponent;
import net.shibboleth.shared.component.UninitializedComponentException;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.primitive.TimerSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* An {@link org.apache.http.client.HttpClient} builder that supports RFC 2616 caching.
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientBuilder.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientBuilder.java
index ceb6af1a..a98a1bbe 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientBuilder.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientBuilder.java
@@ -44,8 +44,8 @@ import org.apache.http.util.CharsetUtils;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotLive;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
//TODO retry attempts, keep alive strategy
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientSupport.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientSupport.java
index 0ad59162..9092b8d5 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientSupport.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientSupport.java
@@ -49,7 +49,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
/**
* Support class for using {@link org.apache.http.client.HttpClient} and related components.
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/IdleConnectionSweeper.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/IdleConnectionSweeper.java
index f4e6ca38..9a8cdd0e 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/IdleConnectionSweeper.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/IdleConnectionSweeper.java
@@ -28,8 +28,8 @@ import javax.annotation.Nullable;
import net.shibboleth.shared.component.DestroyedComponentException;
import net.shibboleth.shared.component.DestructableComponent;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.TimerSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.apache.http.conn.HttpClientConnectionManager;
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/InMemoryCachingHttpClientBuilder.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/InMemoryCachingHttpClientBuilder.java
index 210e72cc..4b8c9ca9 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/InMemoryCachingHttpClientBuilder.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/InMemoryCachingHttpClientBuilder.java
@@ -19,13 +19,13 @@ package net.shibboleth.shared.httpclient;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-
import org.apache.http.impl.client.cache.BasicHttpCacheStorage;
import org.apache.http.impl.client.cache.CacheConfig;
import org.apache.http.impl.client.cache.CachingHttpClientBuilder;
import org.apache.http.impl.client.cache.HeapResourceFactory;
+import net.shibboleth.shared.logic.Constraint;
+
/**
* An {@link org.apache.http.client.HttpClient} builder that supports RFC 2616 caching.
* <p>
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/TLSSocketFactory.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/TLSSocketFactory.java
index 48635e91..c265b3a0 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/httpclient/TLSSocketFactory.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/TLSSocketFactory.java
@@ -35,8 +35,8 @@ import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.apache.http.HttpHost;
import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/CookieManager.java b/shib-networking/src/main/java/net/shibboleth/shared/net/CookieManager.java
index e66ec89d..0deb208f 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/CookieManager.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/CookieManager.java
@@ -29,8 +29,8 @@ import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.AbstractInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* A helper class for managing one or more cookies on behalf of a component.
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/SimpleURLCanonicalizer.java b/shib-networking/src/main/java/net/shibboleth/shared/net/SimpleURLCanonicalizer.java
index 5c8e023b..692c7291 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/SimpleURLCanonicalizer.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/SimpleURLCanonicalizer.java
@@ -27,8 +27,8 @@ import javax.annotation.Nullable;
import com.google.common.base.Strings;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* This class performs simple canonicalization of a URL as follows:
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/impl/HttpServletRequestResponseContext.java b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/HttpServletRequestResponseContext.java
index ece92f8e..9e846037 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/impl/HttpServletRequestResponseContext.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/HttpServletRequestResponseContext.java
@@ -22,7 +22,7 @@ import javax.annotation.Nullable;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.utilities.java.support.net.RequestResponseContextFilter;
/**
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestProxy.java b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestProxy.java
index 79057c33..7504f356 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestProxy.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestProxy.java
@@ -40,7 +40,7 @@ import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.HttpUpgradeHandler;
import jakarta.servlet.http.Part;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
/**
* An implementation of {@link HttpServletRequest} which serves as a proxy for the
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestSupplier.java b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestSupplier.java
index 2cef3dc0..45901d08 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestSupplier.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestSupplier.java
@@ -20,7 +20,7 @@ package net.shibboleth.shared.net.impl;
import java.util.function.Supplier;
import jakarta.servlet.http.HttpServletRequest;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
/**
* An implementation of {@link Supplier} which looks up the current thread-local
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseProxy.java b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseProxy.java
index dcff134b..572682b7 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseProxy.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseProxy.java
@@ -25,7 +25,7 @@ import java.util.Locale;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletResponse;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
/**
* An implementation of {@link HttpServletResponse} which serves as a proxy for the
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseSupplier.java b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseSupplier.java
index aae9b19e..e6bd43e9 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseSupplier.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseSupplier.java
@@ -20,7 +20,7 @@ package net.shibboleth.shared.net.impl;
import java.util.function.Supplier;
import jakarta.servlet.http.HttpServletResponse;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
/**
* An implementation of {@link Supplier} which looks up the current thread-local
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/SameSiteCookieHeaderFilter.java b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/SameSiteCookieHeaderFilter.java
index c1c17a88..b0cfeff4 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/SameSiteCookieHeaderFilter.java
+++ b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/SameSiteCookieHeaderFilter.java
@@ -47,8 +47,8 @@ import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponseWrapper;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/httpclient/HttpClientBuilderTest.java b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/HttpClientBuilderTest.java
index 8f8fa65c..497471d0 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/httpclient/HttpClientBuilderTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/HttpClientBuilderTest.java
@@ -28,7 +28,7 @@ import org.apache.http.client.protocol.HttpClientContext;
import org.testng.Assert;
import org.testng.annotations.Test;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
+import net.shibboleth.shared.logic.ConstraintViolationException;
@SuppressWarnings("javadoc")
public class HttpClientBuilderTest {
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestProxyTest.java b/shib-networking/src/test/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestProxyTest.java
index a67a35ec..b427a530 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestProxyTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestProxyTest.java
@@ -17,8 +17,6 @@
package net.shibboleth.shared.net.impl;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
-
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.testng.Assert;
@@ -28,6 +26,7 @@ import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
+import net.shibboleth.shared.logic.ConstraintViolationException;
/**
* Tests for {@link ThreadLocalHttpServletRequestProxy}.
diff --git a/shib-networking/src/test/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseProxyTest.java b/shib-networking/src/test/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseProxyTest.java
index 4b7ccec4..11cb1c8c 100644
--- a/shib-networking/src/test/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseProxyTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseProxyTest.java
@@ -17,8 +17,6 @@
package net.shibboleth.shared.net.impl;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
-
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.testng.Assert;
@@ -28,6 +26,7 @@ import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
+import net.shibboleth.shared.logic.ConstraintViolationException;
/**
* Tests for {@link ThreadLocalHttpServletResponseProxy}.
diff --git a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/KeyStoreFactoryBean.java b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/KeyStoreFactoryBean.java
index 3009a7be..c399d061 100644
--- a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/KeyStoreFactoryBean.java
+++ b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/KeyStoreFactoryBean.java
@@ -23,8 +23,8 @@ import java.security.KeyStore;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.FactoryBeanNotInitializedException;
diff --git a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBean.java b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBean.java
index ca222891..96f9a8a3 100644
--- a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBean.java
+++ b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PrivateKeyFactoryBean.java
@@ -23,8 +23,8 @@ import java.security.PrivateKey;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.cryptacular.util.KeyPairUtil;
import org.springframework.beans.factory.BeanCreationException;
diff --git a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBean.java b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBean.java
index 2c53784a..de41710e 100644
--- a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBean.java
+++ b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/PublicKeyFactoryBean.java
@@ -22,13 +22,13 @@ import java.security.PublicKey;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-
import org.cryptacular.util.KeyPairUtil;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.core.io.Resource;
+import net.shibboleth.shared.logic.Constraint;
+
/**
* Spring bean factory for producing a {@link PublicKey} from a {@link Resource}.
*
diff --git a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBean.java b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBean.java
index 08b2b7a3..3a09716f 100644
--- a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBean.java
+++ b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateChainFactoryBean.java
@@ -22,13 +22,13 @@ import java.security.cert.X509Certificate;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-
import org.cryptacular.util.CertUtil;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.core.io.Resource;
+import net.shibboleth.shared.logic.Constraint;
+
/**
* Spring bean factory for producing a {@link X509Certificate} chain from a {@link Resource}.
*
diff --git a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBean.java b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBean.java
index e4a1dd02..04fef112 100644
--- a/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBean.java
+++ b/shib-security-spring/src/main/java/net/shibboleth/shared/spring/security/factory/X509CertificateFactoryBean.java
@@ -22,13 +22,13 @@ import java.security.cert.X509Certificate;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-
import org.cryptacular.util.CertUtil;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.core.io.Resource;
+import net.shibboleth.shared.logic.Constraint;
+
/**
* Spring bean factory for producing a {@link X509Certificate} from a {@link Resource}.
*
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java
index 190672f2..8daed103 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java
@@ -49,9 +49,9 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.component.AbstractInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
/**
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java
index 9ebd31c7..cec6f4cd 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java
@@ -45,13 +45,13 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.component.AbstractInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.primitive.TimerSupport;
import net.shibboleth.shared.resource.Resource;
import net.shibboleth.shared.security.DataSealerKeyStrategy;
import net.shibboleth.shared.security.KeyNotFoundException;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
/**
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategyTool.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategyTool.java
index 7bda446a..37b11959 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategyTool.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategyTool.java
@@ -31,8 +31,8 @@ import javax.crypto.SecretKey;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.annotation.constraint.Positive;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/FixedStringIdentifierGenerationStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/FixedStringIdentifierGenerationStrategy.java
index a52264d9..3cd22cfc 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/FixedStringIdentifierGenerationStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/FixedStringIdentifierGenerationStrategy.java
@@ -20,8 +20,8 @@ package net.shibboleth.shared.security.impl;
import javax.annotation.Nonnull;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.security.IdentifierGenerationStrategy;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* Identifier generation strategy using a fixed identifier string.
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/IPRangeAccessControl.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/IPRangeAccessControl.java
index 2994f6d7..56528e73 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/IPRangeAccessControl.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/IPRangeAccessControl.java
@@ -32,10 +32,10 @@ import com.google.common.net.InetAddresses;
import jakarta.servlet.ServletRequest;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.net.HttpServletSupport;
import net.shibboleth.shared.net.IPRange;
import net.shibboleth.shared.security.AccessControl;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* Simple access control implementation based on IP address checking.
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategy.java
index b373823d..94d3702b 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategy.java
@@ -24,8 +24,8 @@ import java.util.Random;
import javax.annotation.Nonnull;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.security.IdentifierGenerationStrategy;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.apache.commons.codec.BinaryEncoder;
import org.apache.commons.codec.EncoderException;
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java
index d2149e5e..c7bf8644 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java
@@ -40,10 +40,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.component.AbstractInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.TimerSupport;
import net.shibboleth.shared.scripting.EvaluableScript;
import net.shibboleth.shared.security.DataSealerKeyStrategy;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/SelfSignedCertificateGenerator.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/SelfSignedCertificateGenerator.java
index cd69a3bf..830f7611 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/SelfSignedCertificateGenerator.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/SelfSignedCertificateGenerator.java
@@ -40,8 +40,8 @@ import javax.annotation.Nullable;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.annotation.constraint.Positive;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.bouncycastle.asn1.ASN1Encodable;
import org.bouncycastle.asn1.DERSequence;
diff --git a/shib-security/src/test/java/net/shibboleth/shared/security/DataSealerTest.java b/shib-security/src/test/java/net/shibboleth/shared/security/DataSealerTest.java
index f505d757..d1b5df4e 100644
--- a/shib-security/src/test/java/net/shibboleth/shared/security/DataSealerTest.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/DataSealerTest.java
@@ -19,9 +19,9 @@ package net.shibboleth.shared.security;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.resource.Resource;
import net.shibboleth.shared.security.impl.BasicKeystoreKeyStrategy;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import java.time.Duration;
import java.time.Instant;
diff --git a/shib-security/src/test/java/net/shibboleth/shared/security/TestResourceConverter.java b/shib-security/src/test/java/net/shibboleth/shared/security/TestResourceConverter.java
index be0fb86a..502daf21 100644
--- a/shib-security/src/test/java/net/shibboleth/shared/security/TestResourceConverter.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/TestResourceConverter.java
@@ -25,10 +25,10 @@ import java.net.URL;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-
import org.springframework.core.io.Resource;
+import net.shibboleth.shared.logic.Constraint;
+
/**
* Bridging class between {@link Resource} and {@link net.shibboleth.shared.resource.Resource}.
*/
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/AbstractReloadableService.java b/shib-service/src/main/java/net/shibboleth/shared/service/AbstractReloadableService.java
index b9ba59b3..27ec7549 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/AbstractReloadableService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/AbstractReloadableService.java
@@ -32,8 +32,8 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.UnmodifiableComponent;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.TimerSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* Base class for {@link ReloadableService}. This base class will use a background thread that will perform a periodic
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableServiceGaugeSet.java b/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableServiceGaugeSet.java
index 3b622ac2..1af196f5 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableServiceGaugeSet.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/ReloadableServiceGaugeSet.java
@@ -36,7 +36,7 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.AbstractInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
/**
* A set of gauges for a reloadable service.
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/impl/LogbackLoggingService.java b/shib-service/src/main/java/net/shibboleth/shared/service/impl/LogbackLoggingService.java
index 3346b2b3..7e6e4158 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/impl/LogbackLoggingService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/impl/LogbackLoggingService.java
@@ -39,13 +39,13 @@ import ch.qos.logback.core.status.StatusManager;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.resource.Resource;
import net.shibboleth.shared.service.AbstractReloadableService;
import net.shibboleth.shared.service.LoggingService;
import net.shibboleth.shared.service.ServiceException;
import net.shibboleth.shared.service.ServiceableComponent;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* Simple {@link LoggingService} that watches for logback configuration file changes
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ProxiedFactoryBean.java b/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ProxiedFactoryBean.java
index 6a3819b4..dc81d4eb 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ProxiedFactoryBean.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ProxiedFactoryBean.java
@@ -27,10 +27,10 @@ import org.springframework.context.ApplicationContext;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.shared.service.ServiceableComponent;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* Factory bean that proxies the creation of a bean through a managed/reloadable
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ReloadableScope.java b/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ReloadableScope.java
index b3dbb43e..8e724d56 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ReloadableScope.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/reloadable/ReloadableScope.java
@@ -21,9 +21,9 @@ import javax.annotation.Nonnull;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.shared.service.ServiceableComponent;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/DelegatingAccessControlService.java b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/DelegatingAccessControlService.java
index 8b08ac84..fd446ff3 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/DelegatingAccessControlService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/DelegatingAccessControlService.java
@@ -26,11 +26,11 @@ import org.slf4j.LoggerFactory;
import jakarta.servlet.ServletRequest;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.security.AccessControl;
import net.shibboleth.shared.security.AccessControlService;
import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.shared.service.ServiceableComponent;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* This class uses the {@link ReloadableService} concept to implement {@link AccessControlService}
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ReloadingAccessControlService.java b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ReloadingAccessControlService.java
index 5d51eb45..d9592819 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ReloadingAccessControlService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ReloadingAccessControlService.java
@@ -21,10 +21,10 @@ import javax.annotation.Nonnull;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.security.AccessControl;
import net.shibboleth.shared.security.AccessControlService;
import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* This class wraps an {@link AccessControlService} in a
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ServiceableAccessControlService.java b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ServiceableAccessControlService.java
index 79fef80c..5686d136 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ServiceableAccessControlService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ServiceableAccessControlService.java
@@ -21,10 +21,10 @@ import javax.annotation.Nonnull;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.security.AccessControl;
import net.shibboleth.shared.security.AccessControlService;
import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* This class wraps an {@link AccessControlService} in a
diff --git a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceableComponent.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceableComponent.java
index da9658db..214d3aa8 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceableComponent.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ApplicationContextServiceableComponent.java
@@ -21,7 +21,7 @@ import javax.annotation.Nonnull;
import org.springframework.context.ApplicationContext;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
/**
* Wraps a Spring {@link ApplicationContext} so it can itself be exposed as a serviceable component.
diff --git a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ClassBasedServiceStrategy.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ClassBasedServiceStrategy.java
index d825eef1..ae245301 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ClassBasedServiceStrategy.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ClassBasedServiceStrategy.java
@@ -26,9 +26,9 @@ import javax.annotation.Nullable;
import org.springframework.context.ApplicationContext;
import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.service.ServiceException;
import net.shibboleth.shared.service.ServiceableComponent;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* Strategy to create {@link ServiceableComponent}s from the {@link ApplicationContext}.
diff --git a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ReloadableSpringService.java b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ReloadableSpringService.java
index e1958dae..c2664f69 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/spring/service/ReloadableSpringService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/spring/service/ReloadableSpringService.java
@@ -45,12 +45,12 @@ import org.springframework.core.io.Resource;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.service.AbstractReloadableService;
import net.shibboleth.shared.service.ServiceException;
import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/AbstractPropertiesApplicationContextInitializer.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/AbstractPropertiesApplicationContextInitializer.java
index 4e81d2bc..263a9137 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/AbstractPropertiesApplicationContextInitializer.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/AbstractPropertiesApplicationContextInitializer.java
@@ -50,9 +50,9 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.annotation.constraint.NotLive;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
/**
* An {@link ApplicationContextInitializer} which appends properties to the application context's environment.
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FileSystemXmlWebApplicationContext.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FileSystemXmlWebApplicationContext.java
index 9eeebd6b..1e509924 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FileSystemXmlWebApplicationContext.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/context/FileSystemXmlWebApplicationContext.java
@@ -24,9 +24,9 @@ import org.springframework.core.io.Resource;
import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.web.context.support.XmlWebApplicationContext;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.spring.resource.ConditionalResourceResolver;
import net.shibboleth.shared.spring.util.AnnotationParameterNameDiscoverer;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* An extension of {@link XmlWebApplicationContext} that (1) is biased in favor of the filesystem such that bare
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SecondaryNamespaceHandler.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SecondaryNamespaceHandler.java
index 890a87ca..10cab98f 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SecondaryNamespaceHandler.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/SecondaryNamespaceHandler.java
@@ -27,7 +27,7 @@ import org.springframework.beans.factory.xml.BeanDefinitionParser;
import org.w3c.dom.Element;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
/**
* A secondary namespace handler to allow us to stack multiple parsers.
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/AbstractSpringExpressionEvaluator.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/AbstractSpringExpressionEvaluator.java
index 81f1277a..f1b2c148 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/AbstractSpringExpressionEvaluator.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/AbstractSpringExpressionEvaluator.java
@@ -29,8 +29,8 @@ import org.springframework.expression.spel.support.StandardEvaluationContext;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* A component that evaluates a Spring EL expression against a set of inputs
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/DOMDocumentFactoryBean.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/DOMDocumentFactoryBean.java
index c1ab028d..94de3518 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/DOMDocumentFactoryBean.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/DOMDocumentFactoryBean.java
@@ -22,8 +22,8 @@ import java.io.InputStream;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.xml.ParserPool;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.FactoryBean;
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/PatternFactoryBean.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/PatternFactoryBean.java
index 464b3e85..ac1d7fdf 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/PatternFactoryBean.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/PatternFactoryBean.java
@@ -22,8 +22,8 @@ import java.util.regex.Pattern;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* Factory bean for {@link Pattern}. Allows us to inject property based case sensitivity.
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResource.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResource.java
index f62440a8..bdad67a0 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResource.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResource.java
@@ -36,7 +36,7 @@ import org.springframework.core.io.Resource;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.AbstractIdentifiedInitializableComponent;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
/**
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/PreferFileSystemResourceLoader.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/PreferFileSystemResourceLoader.java
index c75f808a..929ca919 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/PreferFileSystemResourceLoader.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/PreferFileSystemResourceLoader.java
@@ -23,7 +23,7 @@ import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.ResourcePatternResolver;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
/**
* An extension of {@link DefaultResourceLoader} that (1) is biased in favor of the filesystem such that bare resource
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ResourceHelper.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ResourceHelper.java
index ee4257a8..6c4beb04 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ResourceHelper.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ResourceHelper.java
@@ -26,7 +26,7 @@ import java.net.URL;
import javax.annotation.Nonnull;
import net.shibboleth.shared.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
import org.springframework.core.io.Resource;
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/RunnableFileSystemResource.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/RunnableFileSystemResource.java
index 4c8f5e15..b6a9f066 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/RunnableFileSystemResource.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/RunnableFileSystemResource.java
@@ -30,8 +30,8 @@ import org.springframework.core.io.FileSystemResource;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.resource.Resource;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* A file backed resource which calls out to a provided {@link Runnable} as appropriate such that the resource becomes
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/util/ApplicationContextBuilder.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/ApplicationContextBuilder.java
index 6ce75c0c..ae37d38d 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/util/ApplicationContextBuilder.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/ApplicationContextBuilder.java
@@ -30,6 +30,7 @@ import javax.annotation.Nullable;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.spring.config.BooleanToPredicateConverter;
import net.shibboleth.shared.spring.config.FunctionToFunctionConverter;
@@ -42,7 +43,6 @@ import net.shibboleth.shared.spring.context.FilesystemGenericApplicationContext;
import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.shared.spring.resource.ConditionalResourceResolver;
import net.shibboleth.shared.spring.resource.PreferFileSystemResourceLoader;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/util/SpringSupport.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/SpringSupport.java
index 6d7e710e..bdb37cf0 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/util/SpringSupport.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/SpringSupport.java
@@ -51,12 +51,12 @@ import com.google.common.base.Strings;
import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.net.HttpServletSupport;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.spring.context.FilesystemGenericApplicationContext;
import net.shibboleth.shared.xml.SerializeSupport;
import net.shibboleth.shared.xml.XMLConstants;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* Helper class for performing some common Spring-related functions.
diff --git a/shib-support/src/main/java/net/shibboleth/shared/codec/Base32Support.java b/shib-support/src/main/java/net/shibboleth/shared/codec/Base32Support.java
index 2f9b1f7b..a5d91be7 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/codec/Base32Support.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/codec/Base32Support.java
@@ -19,8 +19,8 @@ package net.shibboleth.shared.codec;
import javax.annotation.Nonnull;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.apache.commons.codec.CodecPolicy;
import org.apache.commons.codec.binary.Base32;
diff --git a/shib-support/src/main/java/net/shibboleth/shared/codec/Base64Support.java b/shib-support/src/main/java/net/shibboleth/shared/codec/Base64Support.java
index 4b0ac336..a4634e41 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/codec/Base64Support.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/codec/Base64Support.java
@@ -19,8 +19,8 @@ package net.shibboleth.shared.codec;
import javax.annotation.Nonnull;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.apache.commons.codec.CodecPolicy;
import org.apache.commons.codec.binary.Base64;
diff --git a/shib-support/src/main/java/net/shibboleth/shared/codec/StringDigester.java b/shib-support/src/main/java/net/shibboleth/shared/codec/StringDigester.java
index 5225166c..63356976 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/codec/StringDigester.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/codec/StringDigester.java
@@ -27,8 +27,8 @@ import javax.annotation.Nullable;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.apache.commons.codec.CharEncoding;
import org.apache.commons.codec.binary.Hex;
diff --git a/shib-support/src/main/java/net/shibboleth/shared/collection/ClassIndexedSet.java b/shib-support/src/main/java/net/shibboleth/shared/collection/ClassIndexedSet.java
index d4f2e34d..fb0eced3 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/collection/ClassIndexedSet.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/ClassIndexedSet.java
@@ -26,7 +26,7 @@ import java.util.Set;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
/**
* Set implementation which provides indexed access to set members via their class, and which allows only one instance
diff --git a/shib-support/src/main/java/net/shibboleth/shared/collection/ClassToInstanceMultiMap.java b/shib-support/src/main/java/net/shibboleth/shared/collection/ClassToInstanceMultiMap.java
index c81bdc3e..66e47ad2 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/collection/ClassToInstanceMultiMap.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/ClassToInstanceMultiMap.java
@@ -20,7 +20,7 @@ package net.shibboleth.shared.collection;
import net.shibboleth.shared.annotation.constraint.Live;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/shib-support/src/main/java/net/shibboleth/shared/collection/Pair.java b/shib-support/src/main/java/net/shibboleth/shared/collection/Pair.java
index e1368331..2be1a60d 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/collection/Pair.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/Pair.java
@@ -20,11 +20,11 @@ package net.shibboleth.shared.collection;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
+import net.shibboleth.shared.logic.Constraint;
+
/**
* Container for a pair of objects.
*
diff --git a/shib-support/src/main/java/net/shibboleth/shared/collection/ReflectionSafeIterator.java b/shib-support/src/main/java/net/shibboleth/shared/collection/ReflectionSafeIterator.java
index 5dbc57a5..c2d0bbd8 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/collection/ReflectionSafeIterator.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/collection/ReflectionSafeIterator.java
@@ -21,7 +21,7 @@ import java.util.Iterator;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
/**
* Wrapper class for delegating publically to {@link Iterator} implementations that
diff --git a/shib-support/src/main/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponent.java b/shib-support/src/main/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponent.java
index 7a19b2f3..8602f51a 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponent.java
@@ -24,8 +24,8 @@ import javax.annotation.concurrent.ThreadSafe;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* Simple implementation of {@link InitializableComponent} and {@link IdentifiedComponent}.
diff --git a/shib-support/src/main/java/net/shibboleth/shared/component/ComponentSupport.java b/shib-support/src/main/java/net/shibboleth/shared/component/ComponentSupport.java
index 026902d3..5ce4f165 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/component/ComponentSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/component/ComponentSupport.java
@@ -20,8 +20,8 @@ package net.shibboleth.shared.component;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/** Support class for working with {@link Component} objects. */
@Deprecated(forRemoval = true, since = "5.0")
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AbstractTriStatePredicate.java b/shib-support/src/main/java/net/shibboleth/shared/logic/AbstractTriStatePredicate.java
similarity index 98%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AbstractTriStatePredicate.java
rename to shib-support/src/main/java/net/shibboleth/shared/logic/AbstractTriStatePredicate.java
index c2057611..e5dbfbb9 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AbstractTriStatePredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/AbstractTriStatePredicate.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.function.Predicate;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicate.java b/shib-support/src/main/java/net/shibboleth/shared/logic/AllMatchPredicate.java
similarity index 97%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicate.java
rename to shib-support/src/main/java/net/shibboleth/shared/logic/AllMatchPredicate.java
index ff8e53b6..15ed55ac 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/AllMatchPredicate.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.function.Predicate;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicate.java b/shib-support/src/main/java/net/shibboleth/shared/logic/AnyMatchPredicate.java
similarity index 97%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicate.java
rename to shib-support/src/main/java/net/shibboleth/shared/logic/AnyMatchPredicate.java
index b5966db5..d3b06085 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/AnyMatchPredicate.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.function.Predicate;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/BiFunctionSupport.java b/shib-support/src/main/java/net/shibboleth/shared/logic/BiFunctionSupport.java
similarity index 98%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/BiFunctionSupport.java
rename to shib-support/src/main/java/net/shibboleth/shared/logic/BiFunctionSupport.java
index 4d2ff2e9..104b98bb 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/BiFunctionSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/BiFunctionSupport.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.function.BiFunction;
import java.util.function.BiPredicate;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/BiPredicateSupport.java b/shib-support/src/main/java/net/shibboleth/shared/logic/BiPredicateSupport.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/BiPredicateSupport.java
rename to shib-support/src/main/java/net/shibboleth/shared/logic/BiPredicateSupport.java
index 2e837807..3fd1c6d4 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/BiPredicateSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/BiPredicateSupport.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.ArrayList;
import java.util.function.BiFunction;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicate.java b/shib-support/src/main/java/net/shibboleth/shared/logic/CaseInsensitiveStringMatchPredicate.java
similarity index 97%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicate.java
rename to shib-support/src/main/java/net/shibboleth/shared/logic/CaseInsensitiveStringMatchPredicate.java
index ff483b84..b2c9b6f3 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/CaseInsensitiveStringMatchPredicate.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.function.Predicate;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/Constraint.java b/shib-support/src/main/java/net/shibboleth/shared/logic/Constraint.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/Constraint.java
rename to shib-support/src/main/java/net/shibboleth/shared/logic/Constraint.java
index 22b88c02..1f16e42f 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/Constraint.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/Constraint.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.Collection;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ConstraintViolationException.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ConstraintViolationException.java
similarity index 96%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ConstraintViolationException.java
rename to shib-support/src/main/java/net/shibboleth/shared/logic/ConstraintViolationException.java
index e37977b8..4ed0964c 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ConstraintViolationException.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ConstraintViolationException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
/**
* An exception that represents the violation of a constraint. For example, a method argument not being within the
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/FunctionSupport.java b/shib-support/src/main/java/net/shibboleth/shared/logic/FunctionSupport.java
similarity index 90%
copy from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/FunctionSupport.java
copy to shib-support/src/main/java/net/shibboleth/shared/logic/FunctionSupport.java
index 995546f4..5171a787 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/FunctionSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/FunctionSupport.java
@@ -15,15 +15,13 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import com.google.common.base.Functions;
-
import net.shibboleth.shared.annotation.ParameterName;
/**
@@ -38,8 +36,7 @@ public final class FunctionSupport {
}
/**
- * Creates a function that returns a constant value, like {@link Functions#constant(Object)}, but
- * with the type of input parameterized as well as the output.
+ * Creates a function that returns a constant value.
*
* @param <T1> type of object the function needs to act on
* @param <T2> type of object being returned
@@ -48,7 +45,7 @@ public final class FunctionSupport {
* @return the constructed function
*/
@Nonnull public static <T1,T2> Function<T1,T2> constant(@Nullable @ParameterName(name="target") final T2 target) {
- return (Function<T1, T2>) Functions.constant(target);
+ return (f) -> target;
}
/**
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateDrivenFunction.java b/shib-support/src/main/java/net/shibboleth/shared/logic/PredicateDrivenFunction.java
similarity index 98%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateDrivenFunction.java
rename to shib-support/src/main/java/net/shibboleth/shared/logic/PredicateDrivenFunction.java
index 6b0a446b..fd676298 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateDrivenFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/PredicateDrivenFunction.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.function.Function;
import java.util.function.Predicate;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java b/shib-support/src/main/java/net/shibboleth/shared/logic/PredicateSupport.java
similarity index 99%
copy from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
copy to shib-support/src/main/java/net/shibboleth/shared/logic/PredicateSupport.java
index 6c3bce1d..274c36c0 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/PredicateSupport.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.ArrayList;
import java.util.function.Function;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/RegexPredicate.java b/shib-support/src/main/java/net/shibboleth/shared/logic/RegexPredicate.java
similarity index 97%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/RegexPredicate.java
rename to shib-support/src/main/java/net/shibboleth/shared/logic/RegexPredicate.java
index 6489695c..a976e4b3 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/RegexPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/RegexPredicate.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.function.Predicate;
import java.util.regex.Pattern;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiConsumer.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java
rename to shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiConsumer.java
index 1e1085c0..25a808a0 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiConsumer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.io.IOException;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiFunction.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiFunction.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiFunction.java
rename to shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiFunction.java
index c591336f..520fc6ae 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiFunction.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.io.IOException;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiPredicate.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java
rename to shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiPredicate.java
index 6efa260a..0ce05693 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiPredicate.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.io.IOException;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedConsumer.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedConsumer.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedConsumer.java
rename to shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedConsumer.java
index 186ddc36..6a8569f9 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedConsumer.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedConsumer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.io.IOException;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedFunction.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java
rename to shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedFunction.java
index 74456a11..d13c92f0 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedFunction.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.io.IOException;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedPredicate.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
rename to shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedPredicate.java
index e0af1f3e..e6d65260 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedPredicate.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.io.IOException;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/StrategyIndirectedPredicate.java b/shib-support/src/main/java/net/shibboleth/shared/logic/StrategyIndirectedPredicate.java
similarity index 98%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/StrategyIndirectedPredicate.java
rename to shib-support/src/main/java/net/shibboleth/shared/logic/StrategyIndirectedPredicate.java
index 5e5013d2..82b48f31 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/StrategyIndirectedPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/StrategyIndirectedPredicate.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.Collection;
import java.util.function.Function;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java b/shib-support/src/main/java/net/shibboleth/shared/logic/TransformAndCheckFunction.java
similarity index 95%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java
rename to shib-support/src/main/java/net/shibboleth/shared/logic/TransformAndCheckFunction.java
index 10e06f58..8289a0ff 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/TransformAndCheckFunction.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.Objects;
import java.util.Optional;
import java.util.function.Function;
+import java.util.function.Predicate;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
@@ -41,7 +42,7 @@ public class TransformAndCheckFunction<T> implements Function<T, Optional<? exte
private final Function<T, ? extends T> preprocessor;
/** A constraint which must be met in order for an input to be valid. */
- private final java.util.function.Predicate<T> constraint;
+ private final Predicate<T> constraint;
/** Whether input that does not meet the constraint should cause an error or just be silently dropped. */
private final boolean failOnConstraintViolation;
@@ -55,7 +56,7 @@ public class TransformAndCheckFunction<T> implements Function<T, Optional<? exte
* just be ignored
*/
public TransformAndCheckFunction(@Nonnull final Function<T, ? extends T> inputPreprocessor,
- @Nonnull final java.util.function.Predicate<T> inputConstraint,
+ @Nonnull final Predicate<T> inputConstraint,
final boolean failOnInputConstraintViolation) {
preprocessor = Constraint.isNotNull(inputPreprocessor, "Input preprocessor can not be null");
constraint = Constraint.isNotNull(inputConstraint, "Input constraint can not be null");
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java b/shib-support/src/main/java/net/shibboleth/shared/logic/TrimOrNullStringFunction.java
similarity index 97%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java
rename to shib-support/src/main/java/net/shibboleth/shared/logic/TrimOrNullStringFunction.java
index 0dda3805..28190517 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/TrimOrNullStringFunction.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.function.Function;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunctionTest.java b/shib-support/src/main/java/net/shibboleth/shared/logic/package-info.java
similarity index 55%
copy from shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunctionTest.java
copy to shib-support/src/main/java/net/shibboleth/shared/logic/package-info.java
index f272540a..6e2bb74c 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunctionTest.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/package-info.java
@@ -15,20 +15,5 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
-
-import org.testng.annotations.Test;
-
-/**
- * tests for {@link TrimOrNullStringFunction}
- */
-public class TrimOrNullStringFunctionTest {
-
- @Test public void test() {
- org.testng.Assert.assertNull(TrimOrNullStringFunction.INSTANCE.apply(null), "null gives null");
- org.testng.Assert.assertNull(TrimOrNullStringFunction.INSTANCE.apply(""), "empty gives null");
- String testString = " Nibble a Happy wartthod\t";
- String trimmedString = testString.trim();
- org.testng.Assert.assertEquals(TrimOrNullStringFunction.INSTANCE.apply(testString), trimmedString, "null gives null");
- }
-}
+/** Classes that represent basic first order logic concepts. */
+package net.shibboleth.shared.logic;
\ No newline at end of file
diff --git a/shib-support/src/main/java/net/shibboleth/shared/primitive/StringSupport.java b/shib-support/src/main/java/net/shibboleth/shared/primitive/StringSupport.java
index 50041392..a854584a 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/primitive/StringSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/primitive/StringSupport.java
@@ -36,8 +36,8 @@ import javax.annotation.Nullable;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NullableElements;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
+import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.logic.ConstraintViolationException;
/** String utility methods. */
public final class StringSupport {
diff --git a/shib-support/src/main/java/net/shibboleth/shared/primitive/TimerSupport.java b/shib-support/src/main/java/net/shibboleth/shared/primitive/TimerSupport.java
index 9bf99019..259d30e9 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/primitive/TimerSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/primitive/TimerSupport.java
@@ -24,7 +24,7 @@ import javax.annotation.Nullable;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.IdentifiedComponent;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
/** Timer utility methods. */
public final class TimerSupport {
diff --git a/shib-support/src/main/java/net/shibboleth/shared/resolver/ClassCriterion.java b/shib-support/src/main/java/net/shibboleth/shared/resolver/ClassCriterion.java
index 6d173312..eb7867f0 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/resolver/ClassCriterion.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resolver/ClassCriterion.java
@@ -20,7 +20,7 @@ package net.shibboleth.shared.resolver;
import javax.annotation.Nonnull;
import net.shibboleth.shared.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
/**
* A {@link Criterion} based on class type.
diff --git a/shib-support/src/main/java/net/shibboleth/shared/resolver/CriterionPredicateRegistry.java b/shib-support/src/main/java/net/shibboleth/shared/resolver/CriterionPredicateRegistry.java
index 62a2e628..946b8345 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/resolver/CriterionPredicateRegistry.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resolver/CriterionPredicateRegistry.java
@@ -29,8 +29,8 @@ import java.util.function.Predicate;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-support/src/main/java/net/shibboleth/shared/resolver/ResolverSupport.java b/shib-support/src/main/java/net/shibboleth/shared/resolver/ResolverSupport.java
index f8ee0f53..6b125661 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/resolver/ResolverSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/resolver/ResolverSupport.java
@@ -27,7 +27,7 @@ import javax.annotation.Nullable;
import com.google.common.collect.Iterables;
-import net.shibboleth.utilities.java.support.logic.PredicateSupport;
+import net.shibboleth.shared.logic.PredicateSupport;
/**
* Support class for resolver implementations.
diff --git a/shib-support/src/main/java/net/shibboleth/shared/scripting/AbstractScriptEvaluator.java b/shib-support/src/main/java/net/shibboleth/shared/scripting/AbstractScriptEvaluator.java
index e486d6ad..88d7e680 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/scripting/AbstractScriptEvaluator.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/scripting/AbstractScriptEvaluator.java
@@ -30,7 +30,7 @@ import javax.script.SimpleScriptContext;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-support/src/main/java/net/shibboleth/shared/scripting/EvaluableScript.java b/shib-support/src/main/java/net/shibboleth/shared/scripting/EvaluableScript.java
index 546b5ada..4a9490fa 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/scripting/EvaluableScript.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/scripting/EvaluableScript.java
@@ -41,10 +41,10 @@ import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.AbstractInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.resource.Resource;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
/** This is a helper class that takes care of reading in, optionally compiling, and evaluating a script. */
public final class EvaluableScript extends AbstractInitializableComponent {
diff --git a/shib-support/src/main/java/net/shibboleth/shared/scripting/ScriptedRunnable.java b/shib-support/src/main/java/net/shibboleth/shared/scripting/ScriptedRunnable.java
index 34c2cb9a..7902bf9a 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/scripting/ScriptedRunnable.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/scripting/ScriptedRunnable.java
@@ -28,7 +28,7 @@ import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.UnmodifiableComponent;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
/**
* A Runnable which executes a script.
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/AttributeSupport.java b/shib-support/src/main/java/net/shibboleth/shared/xml/AttributeSupport.java
index 5b04b490..f3ee4241 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/AttributeSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/AttributeSupport.java
@@ -26,8 +26,8 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.xml.namespace.QName;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/DOMTypeSupport.java b/shib-support/src/main/java/net/shibboleth/shared/xml/DOMTypeSupport.java
index 15d8f92b..bfd7713c 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/DOMTypeSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/DOMTypeSupport.java
@@ -30,8 +30,8 @@ import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/ElementSupport.java b/shib-support/src/main/java/net/shibboleth/shared/xml/ElementSupport.java
index c7aa2c3f..fee2e2d7 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/ElementSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/ElementSupport.java
@@ -28,8 +28,8 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.xml.namespace.QName;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/NamespaceSupport.java b/shib-support/src/main/java/net/shibboleth/shared/xml/NamespaceSupport.java
index 14a018e4..2e23ec14 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/NamespaceSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/NamespaceSupport.java
@@ -22,8 +22,8 @@ import java.util.Objects;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/QNameSupport.java b/shib-support/src/main/java/net/shibboleth/shared/xml/QNameSupport.java
index eae9b3d1..6b484434 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/QNameSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/QNameSupport.java
@@ -24,8 +24,8 @@ import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/SchemaBuilder.java b/shib-support/src/main/java/net/shibboleth/shared/xml/SchemaBuilder.java
index a43f45a7..5568f3dc 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/SchemaBuilder.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/SchemaBuilder.java
@@ -37,10 +37,10 @@ import javax.xml.validation.SchemaFactory;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.annotation.constraint.NullableElements;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.resource.Resource;
import net.shibboleth.shared.xml.impl.LoggingErrorHandler;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/SerializeSupport.java b/shib-support/src/main/java/net/shibboleth/shared/xml/SerializeSupport.java
index cb44771a..b30cab91 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/SerializeSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/SerializeSupport.java
@@ -26,7 +26,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.shibboleth.shared.collection.LazyMap;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
import org.w3c.dom.DOMConfiguration;
import org.w3c.dom.DOMImplementation;
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/impl/BasicParserPool.java b/shib-support/src/main/java/net/shibboleth/shared/xml/impl/BasicParserPool.java
index bfb1a196..19e3e5bc 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/impl/BasicParserPool.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/impl/BasicParserPool.java
@@ -55,10 +55,10 @@ import net.shibboleth.shared.annotation.constraint.NullableElements;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.shared.component.AbstractInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.xml.ParserPool;
import net.shibboleth.shared.xml.XMLParserException;
-import net.shibboleth.utilities.java.support.logic.Constraint;
//TODO(lajoie) see if we can use either java.util.concurrent or Guava
// classes for the pool so we don't have to manage synchronicity
diff --git a/shib-support/src/main/java/net/shibboleth/shared/xml/impl/LoggingErrorHandler.java b/shib-support/src/main/java/net/shibboleth/shared/xml/impl/LoggingErrorHandler.java
index d82562be..2060488b 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/xml/impl/LoggingErrorHandler.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/xml/impl/LoggingErrorHandler.java
@@ -24,7 +24,7 @@ import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
/**
* A SAX error handler that logs errors to a {@link Logger} before rethrowing them.
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/FunctionSupport.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/FunctionSupport.java
index 995546f4..e876398f 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/FunctionSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/FunctionSupport.java
@@ -22,14 +22,16 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import com.google.common.base.Functions;
-
import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
- * Helper class for constructing functions that are fully generic, in contrast to the broken,
- * Object-bound types Guava can build.
+ * Legacy stub for {@link net.shibboleth.shared.logic.FunctionSupport}.
+ *
+ * @deprecated
*/
+ at Deprecated(since="8.3.0", forRemoval=true)
public final class FunctionSupport {
/** Constructor. */
@@ -38,8 +40,7 @@ public final class FunctionSupport {
}
/**
- * Creates a function that returns a constant value, like {@link Functions#constant(Object)}, but
- * with the type of input parameterized as well as the output.
+ * Creates a function that returns a constant value.
*
* @param <T1> type of object the function needs to act on
* @param <T2> type of object being returned
@@ -48,7 +49,10 @@ public final class FunctionSupport {
* @return the constructed function
*/
@Nonnull public static <T1,T2> Function<T1,T2> constant(@Nullable @ParameterName(name="target") final T2 target) {
- return (Function<T1, T2>) Functions.constant(target);
+ DeprecationSupport.warn(ObjectType.CLASS, FunctionSupport.class.getName(), null,
+ net.shibboleth.shared.logic.FunctionSupport.class.getName());
+
+ return net.shibboleth.shared.logic.FunctionSupport.constant(target);
}
/**
@@ -67,7 +71,10 @@ public final class FunctionSupport {
@Nonnull public static <A,B,C> Function<A,C> compose(
@Nonnull @ParameterName(name="g") final Function<? super B,? extends C> g,
@Nonnull @ParameterName(name="f") final Function<A,? extends B> f) {
- return f.andThen(g);
+ DeprecationSupport.warn(ObjectType.CLASS, FunctionSupport.class.getName(), null,
+ net.shibboleth.shared.logic.FunctionSupport.class.getName());
+
+ return net.shibboleth.shared.logic.FunctionSupport.compose(g, f);
}
/**
@@ -82,7 +89,10 @@ public final class FunctionSupport {
*/
@Nonnull public static <T> Function<T,Boolean> forPredicate(
@Nonnull @ParameterName(name="predicate") final java.util.function.Predicate<T> predicate) {
- return predicate::test;
+ DeprecationSupport.warn(ObjectType.CLASS, FunctionSupport.class.getName(), null,
+ net.shibboleth.shared.logic.FunctionSupport.class.getName());
+
+ return net.shibboleth.shared.logic.FunctionSupport.forPredicate(predicate);
}
}
\ No newline at end of file
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
index 6c3bce1d..4120e287 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
@@ -17,19 +17,20 @@
package net.shibboleth.utilities.java.support.logic;
-import java.util.ArrayList;
import java.util.function.Function;
import java.util.function.Predicate;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import com.google.common.base.Predicates;
+import net.shibboleth.shared.primitive.DeprecationSupport;
+import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
- * Helper class for constructing predicates. Especially useful for creating internal DSLs via Java's static method
- * import mechanism.
+ * Legacy stub for {@link net.shibboleth.shared.logic.PredicateSupport}.
+ *
+ * @deprecated
*/
+ at Deprecated(since="8.3.0", forRemoval=true)
public final class PredicateSupport {
/** Constructor. */
@@ -45,7 +46,10 @@ public final class PredicateSupport {
* @return the constructed predicate
*/
@Nonnull public static <T> Predicate<Iterable<T>> allMatch(@Nonnull final Predicate<T> target) {
- return new AllMatchPredicate<T>(target);
+ DeprecationSupport.warn(ObjectType.CLASS, PredicateSupport.class.getName(), null,
+ net.shibboleth.shared.logic.PredicateSupport.class.getName());
+
+ return net.shibboleth.shared.logic.PredicateSupport.allMatch(target);
}
/**
@@ -57,7 +61,10 @@ public final class PredicateSupport {
* @return the constructed predicate
*/
@Nonnull public static <T> Predicate<Iterable<T>> anyMatch(@Nonnull final Predicate<T> target) {
- return new AnyMatchPredicate<>(target);
+ DeprecationSupport.warn(ObjectType.CLASS, PredicateSupport.class.getName(), null,
+ net.shibboleth.shared.logic.PredicateSupport.class.getName());
+
+ return net.shibboleth.shared.logic.PredicateSupport.anyMatch(target);
}
/**
@@ -68,7 +75,10 @@ public final class PredicateSupport {
* @return the constructed predicate
*/
@Nonnull public static Predicate<CharSequence> caseInsensitiveMatch(@Nonnull final String target) {
- return new CaseInsensitiveStringMatchPredicate(target);
+ DeprecationSupport.warn(ObjectType.CLASS, PredicateSupport.class.getName(), null,
+ net.shibboleth.shared.logic.PredicateSupport.class.getName());
+
+ return net.shibboleth.shared.logic.PredicateSupport.caseInsensitiveMatch(target);
}
/**
@@ -86,12 +96,10 @@ public final class PredicateSupport {
*/
@Nonnull public static <T> Predicate<T> fromFunction(@Nonnull final Function<T,Boolean> function,
@Nonnull final Predicate<? super T> defValue) {
- return new Predicate<>() {
- public boolean test(@Nullable final T input) {
- final Boolean result = function.apply(input);
- return result != null ? result : defValue.test(input);
- }
- };
+ DeprecationSupport.warn(ObjectType.CLASS, PredicateSupport.class.getName(), null,
+ net.shibboleth.shared.logic.PredicateSupport.class.getName());
+
+ return net.shibboleth.shared.logic.PredicateSupport.fromFunction(function, defValue);
}
/**
@@ -104,7 +112,10 @@ public final class PredicateSupport {
* @return the negated predicate
*/
@Nonnull public static <T> Predicate<T> not(@Nonnull final Predicate<? super T> predicate) {
- return predicate.negate()::test;
+ DeprecationSupport.warn(ObjectType.CLASS, PredicateSupport.class.getName(), null,
+ net.shibboleth.shared.logic.PredicateSupport.class.getName());
+
+ return net.shibboleth.shared.logic.PredicateSupport.not(predicate);
}
/**
@@ -121,13 +132,10 @@ public final class PredicateSupport {
*/
@Nonnull public static <T> Predicate<T> and(
@Nonnull final Iterable<? extends Predicate<? super T>> components) {
+ DeprecationSupport.warn(ObjectType.CLASS, PredicateSupport.class.getName(), null,
+ net.shibboleth.shared.logic.PredicateSupport.class.getName());
- final ArrayList<com.google.common.base.Predicate<T>> copy = new ArrayList<>();
- for (final Predicate<? super T> p : components) {
- copy.add(p::test);
- }
-
- return Predicates.and(copy)::test;
+ return net.shibboleth.shared.logic.PredicateSupport.and(components);
}
/**
@@ -145,12 +153,10 @@ public final class PredicateSupport {
@SafeVarargs
@Nonnull public static <T> Predicate<T> and(
@Nonnull final Predicate<? super T>... components) {
- final ArrayList<com.google.common.base.Predicate<T>> copy = new ArrayList<>();
- for (final Predicate<? super T> p : components) {
- copy.add(p::test);
- }
+ DeprecationSupport.warn(ObjectType.CLASS, PredicateSupport.class.getName(), null,
+ net.shibboleth.shared.logic.PredicateSupport.class.getName());
- return Predicates.and(copy)::test;
+ return net.shibboleth.shared.logic.PredicateSupport.and(components);
}
/**
@@ -168,8 +174,10 @@ public final class PredicateSupport {
*/
@Nonnull public static <T> Predicate<T> and(@Nonnull final Predicate<? super T> first,
@Nonnull final Predicate<? super T> second) {
+ DeprecationSupport.warn(ObjectType.CLASS, PredicateSupport.class.getName(), null,
+ net.shibboleth.shared.logic.PredicateSupport.class.getName());
- return t -> first.test(t) && second.test(t);
+ return net.shibboleth.shared.logic.PredicateSupport.and(first, second);
}
/**
@@ -186,13 +194,10 @@ public final class PredicateSupport {
*/
@Nonnull public static <T> Predicate<T> or(
@Nonnull final Iterable<? extends Predicate<? super T>> components) {
+ DeprecationSupport.warn(ObjectType.CLASS, PredicateSupport.class.getName(), null,
+ net.shibboleth.shared.logic.PredicateSupport.class.getName());
- final ArrayList<com.google.common.base.Predicate<T>> copy = new ArrayList<>();
- for (final Predicate<? super T> p : components) {
- copy.add(p::test);
- }
-
- return Predicates.or(copy)::test;
+ return net.shibboleth.shared.logic.PredicateSupport.or(components);
}
/**
@@ -210,13 +215,10 @@ public final class PredicateSupport {
@SafeVarargs
@Nonnull public static <T> Predicate<T> or(
@Nonnull final Predicate<? super T>... components) {
+ DeprecationSupport.warn(ObjectType.CLASS, PredicateSupport.class.getName(), null,
+ net.shibboleth.shared.logic.PredicateSupport.class.getName());
- final ArrayList<com.google.common.base.Predicate<T>> copy = new ArrayList<>();
- for (final Predicate<? super T> p : components) {
- copy.add(p::test);
- }
-
- return Predicates.or(copy)::test;
+ return net.shibboleth.shared.logic.PredicateSupport.or(components);
}
/**
@@ -234,8 +236,10 @@ public final class PredicateSupport {
*/
@Nonnull public static <T> Predicate<T> or(@Nonnull final Predicate<? super T> first,
@Nonnull final Predicate<? super T> second) {
+ DeprecationSupport.warn(ObjectType.CLASS, PredicateSupport.class.getName(), null,
+ net.shibboleth.shared.logic.PredicateSupport.class.getName());
- return t -> first.test(t) || second.test(t);
+ return net.shibboleth.shared.logic.PredicateSupport.or(first, second);
}
}
\ No newline at end of file
diff --git a/shib-support/src/test/java/net/shibboleth/shared/codec/Base32SupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/codec/Base32SupportTest.java
index 036751ea..4138be86 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/codec/Base32SupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/codec/Base32SupportTest.java
@@ -20,7 +20,7 @@ package net.shibboleth.shared.codec;
import org.testng.Assert;
import org.testng.annotations.Test;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
+import net.shibboleth.shared.logic.ConstraintViolationException;
/** {@link Base32Support} unit test. */
public class Base32SupportTest {
diff --git a/shib-support/src/test/java/net/shibboleth/shared/codec/Base64SupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/codec/Base64SupportTest.java
index cfdcd300..91c4ed1a 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/codec/Base64SupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/codec/Base64SupportTest.java
@@ -23,7 +23,7 @@ import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
+import net.shibboleth.shared.logic.ConstraintViolationException;
/** {@link Base64Support} unit test. */
public class Base64SupportTest {
diff --git a/shib-support/src/test/java/net/shibboleth/shared/codec/StringDigesterTest.java b/shib-support/src/test/java/net/shibboleth/shared/codec/StringDigesterTest.java
index c2c4fb06..79a5a896 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/codec/StringDigesterTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/codec/StringDigesterTest.java
@@ -20,7 +20,7 @@ package net.shibboleth.shared.codec;
import java.security.NoSuchAlgorithmException;
import net.shibboleth.shared.codec.StringDigester.OutputFormat;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
+import net.shibboleth.shared.logic.ConstraintViolationException;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/shib-support/src/test/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponentTest.java b/shib-support/src/test/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponentTest.java
index b225485b..f4197564 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponentTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/component/AbstractIdentifiedInitializableComponentTest.java
@@ -17,11 +17,11 @@
package net.shibboleth.shared.component;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
-
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.shared.logic.ConstraintViolationException;
+
/** Test for {@link AbstractIdentifiedInitializableComponent}. */
public class AbstractIdentifiedInitializableComponentTest {
diff --git a/shib-support/src/test/java/net/shibboleth/shared/component/ComponentSupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/component/ComponentSupportTest.java
index 1ad0a0ff..2ec82004 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/component/ComponentSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/component/ComponentSupportTest.java
@@ -17,11 +17,11 @@
package net.shibboleth.shared.component;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
-
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.shared.logic.ConstraintViolationException;
+
/** Tests for {@link ComponentSupport} */
public class ComponentSupportTest {
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicateTest.java b/shib-support/src/test/java/net/shibboleth/shared/logic/AllMatchPredicateTest.java
similarity index 93%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicateTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/logic/AllMatchPredicateTest.java
index b62c868f..598c6533 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicateTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/AllMatchPredicateTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.Arrays;
import java.util.Collections;
@@ -28,6 +28,7 @@ import com.google.common.base.Predicates;
/** {@link AllMatchPredicate} unit test. */
public class AllMatchPredicateTest {
+ /** unit test. */
@Test public void testApply() {
AllMatchPredicate<String> predicate = new AllMatchPredicate<>(Predicates.equalTo("foo"));
@@ -35,7 +36,7 @@ public class AllMatchPredicateTest {
Assert.fail();
}
- if (predicate.test(Collections.EMPTY_LIST)) {
+ if (predicate.test(Collections.emptyList())) {
Assert.fail();
}
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicateTest.java b/shib-support/src/test/java/net/shibboleth/shared/logic/AnyMatchPredicateTest.java
similarity index 93%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicateTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/logic/AnyMatchPredicateTest.java
index c0c3fb6a..66de4967 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicateTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/AnyMatchPredicateTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.Arrays;
import java.util.Collections;
@@ -25,9 +25,11 @@ import org.testng.annotations.Test;
import com.google.common.base.Predicates;
+
/** {@link AnyMatchPredicate} unit test. */
public class AnyMatchPredicateTest {
+ /** unit test. */
@Test public void testApply(){
AnyMatchPredicate<String> predicate = new AnyMatchPredicate<>(Predicates.equalTo("foo"));
@@ -35,7 +37,7 @@ public class AnyMatchPredicateTest {
Assert.fail();
}
- if (predicate.test(Collections.EMPTY_LIST)) {
+ if (predicate.test(Collections.emptyList())) {
Assert.fail();
}
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicateTest.java b/shib-support/src/test/java/net/shibboleth/shared/logic/CaseInsensitiveStringMatchPredicateTest.java
similarity index 96%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicateTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/logic/CaseInsensitiveStringMatchPredicateTest.java
index 4e8821cb..c34053dd 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicateTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/CaseInsensitiveStringMatchPredicateTest.java
@@ -15,14 +15,16 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import org.testng.Assert;
import org.testng.annotations.Test;
+
/** {@link CaseInsensitiveStringMatchPredicate} unit test. */
public class CaseInsensitiveStringMatchPredicateTest {
-
+
+ /** unit test. */
@Test public void testApply(){
CaseInsensitiveStringMatchPredicate predicate = new CaseInsensitiveStringMatchPredicate("FoO");
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionFunction.java b/shib-support/src/test/java/net/shibboleth/shared/logic/ComponentInitializationExceptionFunction.java
similarity index 94%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionFunction.java
rename to shib-support/src/test/java/net/shibboleth/shared/logic/ComponentInitializationExceptionFunction.java
index 965fc1d6..1d659852 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionFunction.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/ComponentInitializationExceptionFunction.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.function.Function;
@@ -25,6 +25,9 @@ import net.shibboleth.shared.component.InitializableComponent;
/**
* A {@link Function} that always throws a {@link ComponentInitializationException} when {@link #initialize()} is
* called.
+ *
+ * @param <T> input type
+ * @param <R> return type
*/
public class ComponentInitializationExceptionFunction<T,R> implements Function<T,R>, InitializableComponent {
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionPredicate.java b/shib-support/src/test/java/net/shibboleth/shared/logic/ComponentInitializationExceptionPredicate.java
similarity index 96%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionPredicate.java
rename to shib-support/src/test/java/net/shibboleth/shared/logic/ComponentInitializationExceptionPredicate.java
index 151f4ab7..3e9d5d89 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionPredicate.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/ComponentInitializationExceptionPredicate.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.function.Predicate;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionFunction.java b/shib-support/src/test/java/net/shibboleth/shared/logic/ExceptionFunction.java
similarity index 88%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionFunction.java
rename to shib-support/src/test/java/net/shibboleth/shared/logic/ExceptionFunction.java
index 7b3fa7bb..50ce7fc6 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionFunction.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/ExceptionFunction.java
@@ -15,13 +15,18 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.function.Function;
import javax.annotation.Nonnull;
-/** A {@link Function} that always throws a {@link RuntimeException} of some sort. */
+/**
+ * A {@link Function} that always throws a {@link RuntimeException} of some sort.
+ *
+ * @param <T> input type
+ * @param <R> return type
+ */
public class ExceptionFunction<T,R> implements Function<T,R> {
/** Exception that will be thrown when this function is executed. */
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionPredicate.java b/shib-support/src/test/java/net/shibboleth/shared/logic/ExceptionPredicate.java
similarity index 96%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionPredicate.java
rename to shib-support/src/test/java/net/shibboleth/shared/logic/ExceptionPredicate.java
index 4af9f60c..cd06dd0f 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionPredicate.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/ExceptionPredicate.java
@@ -15,12 +15,13 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.function.Predicate;
import javax.annotation.Nonnull;
+
/** A {@link Predicate} that always throws a {@link RuntimeException} of some sort. */
public class ExceptionPredicate implements Predicate<Object> {
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ScriptedTest.java b/shib-support/src/test/java/net/shibboleth/shared/logic/ScriptedTest.java
similarity index 98%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ScriptedTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/logic/ScriptedTest.java
index f8c188ac..140459b9 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ScriptedTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/ScriptedTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import org.testng.Assert;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunctionTest.java b/shib-support/src/test/java/net/shibboleth/shared/logic/TransformAndCheckFunctionTest.java
similarity index 98%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunctionTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/logic/TransformAndCheckFunctionTest.java
index 0d8b842b..2e489cc0 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunctionTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/TransformAndCheckFunctionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import java.util.Arrays;
import java.util.List;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunctionTest.java b/shib-support/src/test/java/net/shibboleth/shared/logic/TrimOrNullStringFunctionTest.java
similarity index 96%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunctionTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/logic/TrimOrNullStringFunctionTest.java
index f272540a..9efb5740 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunctionTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/logic/TrimOrNullStringFunctionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.logic;
+package net.shibboleth.shared.logic;
import org.testng.annotations.Test;
@@ -24,6 +24,7 @@ import org.testng.annotations.Test;
*/
public class TrimOrNullStringFunctionTest {
+ /** unit test. */
@Test public void test() {
org.testng.Assert.assertNull(TrimOrNullStringFunction.INSTANCE.apply(null), "null gives null");
org.testng.Assert.assertNull(TrimOrNullStringFunction.INSTANCE.apply(""), "empty gives null");
diff --git a/shib-support/src/test/java/net/shibboleth/shared/primitive/StringSupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/primitive/StringSupportTest.java
index 0837fb49..8ef1eac3 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/primitive/StringSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/primitive/StringSupportTest.java
@@ -36,7 +36,7 @@ import javax.annotation.Nonnull;
import org.testng.annotations.Test;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
+import net.shibboleth.shared.logic.ConstraintViolationException;
/**
* test for the various methods inside {@link StringSupport}
diff --git a/shib-support/src/test/java/net/shibboleth/shared/scripting/EvaluableScriptTest.java b/shib-support/src/test/java/net/shibboleth/shared/scripting/EvaluableScriptTest.java
index 17bd2c4b..24989f10 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/scripting/EvaluableScriptTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/scripting/EvaluableScriptTest.java
@@ -30,8 +30,8 @@ import javax.script.ScriptException;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.resource.Resource;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
diff --git a/shib-support/src/test/java/net/shibboleth/shared/xml/AttributeSupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/xml/AttributeSupportTest.java
index 55f65d40..c5c8c048 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/xml/AttributeSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/xml/AttributeSupportTest.java
@@ -31,8 +31,8 @@ import javax.xml.parsers.DocumentBuilder;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.xml.impl.BasicParserPool;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
diff --git a/shib-support/src/test/java/net/shibboleth/shared/xml/ElementSupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/xml/ElementSupportTest.java
index 116f70e5..71e12bc4 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/xml/ElementSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/xml/ElementSupportTest.java
@@ -29,9 +29,9 @@ import javax.xml.parsers.DocumentBuilder;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.xml.impl.BasicParserPool;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
diff --git a/shib-support/src/test/java/net/shibboleth/shared/xml/QNameSupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/xml/QNameSupportTest.java
index 776f4222..84cfa065 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/xml/QNameSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/xml/QNameSupportTest.java
@@ -26,8 +26,8 @@ import javax.xml.parsers.DocumentBuilder;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.xml.impl.BasicParserPool;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
diff --git a/shib-support/src/test/java/net/shibboleth/shared/xml/TestResourceConverter.java b/shib-support/src/test/java/net/shibboleth/shared/xml/TestResourceConverter.java
index b61745d7..1ad762a9 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/xml/TestResourceConverter.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/xml/TestResourceConverter.java
@@ -25,10 +25,10 @@ import java.net.URL;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-
import org.springframework.core.io.Resource;
+import net.shibboleth.shared.logic.Constraint;
+
/**
* Bridging class between {@link Resource} and {@link net.shibboleth.shared.resource.Resource}.
*/
diff --git a/shib-support/src/test/java/net/shibboleth/shared/xml/impl/BasicParserPoolTest.java b/shib-support/src/test/java/net/shibboleth/shared/xml/impl/BasicParserPoolTest.java
index 93e8d311..7032f550 100644
--- a/shib-support/src/test/java/net/shibboleth/shared/xml/impl/BasicParserPoolTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/xml/impl/BasicParserPoolTest.java
@@ -39,12 +39,12 @@ import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.DestroyedComponentException;
import net.shibboleth.shared.component.UninitializedComponentException;
import net.shibboleth.shared.component.UnmodifiableComponentException;
+import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.shared.xml.NamespaceSupport;
import net.shibboleth.shared.xml.SchemaBuilder;
import net.shibboleth.shared.xml.XMLParserException;
import net.shibboleth.shared.xml.impl.BasicParserPool.DocumentBuilderProxy;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/shib-testing/src/main/java/net/shibboleth/shared/testing/RepositorySupport.java b/shib-testing/src/main/java/net/shibboleth/shared/testing/RepositorySupport.java
index 75d7e319..91dce4e7 100644
--- a/shib-testing/src/main/java/net/shibboleth/shared/testing/RepositorySupport.java
+++ b/shib-testing/src/main/java/net/shibboleth/shared/testing/RepositorySupport.java
@@ -20,8 +20,8 @@ package net.shibboleth.shared.testing;
import javax.annotation.Nonnull;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
/**
* Support class for working with the project version control repository.
diff --git a/shib-velocity/src/main/java/net/shibboleth/shared/velocity/Template.java b/shib-velocity/src/main/java/net/shibboleth/shared/velocity/Template.java
index d8a31a87..4500f3e8 100644
--- a/shib-velocity/src/main/java/net/shibboleth/shared/velocity/Template.java
+++ b/shib-velocity/src/main/java/net/shibboleth/shared/velocity/Template.java
@@ -26,8 +26,8 @@ import java.util.UUID;
import javax.annotation.Nonnull;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list