[java-shib-shared] branch main updated: Rename shared annotation packages.
Scott Cantor
cantor.2 at osu.edu
Thu Sep 22 18:11:24 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=ed36d8741ea75438250b8696a656511453015cf8
The following commit(s) were added to refs/heads/main by this push:
new ed36d874 Rename shared annotation packages.
ed36d874 is described below
commit ed36d8741ea75438250b8696a656511453015cf8
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Sep 22 14:11:21 2022 -0400
Rename shared annotation packages.
---
.../java/net/shibboleth/shared/cli/AbstractCommandLine.java | 8 ++++----
.../shibboleth/shared/cli/AbstractCommandLineArguments.java | 6 +++---
.../net/shibboleth/shared/cli/CommandLineArguments.java | 4 ++--
.../spring/httpclient/resource/FileBackedHTTPResource.java | 4 ++--
.../shared/spring/httpclient/resource/HTTPResource.java | 4 ++--
.../spring/httpclient/resource/RepositorySupport.java | 2 +-
.../shared/httpclient/FileCachingHttpClientBuilder.java | 2 +-
.../net/shibboleth/shared/httpclient/HttpClientBuilder.java | 6 +++---
.../net/shibboleth/shared/httpclient/HttpClientSupport.java | 2 +-
.../net/shibboleth/shared/httpclient/TLSSocketFactory.java | 2 +-
.../main/java/net/shibboleth/shared/net/CookieManager.java | 4 ++--
.../java/net/shibboleth/shared/net/HttpServletSupport.java | 4 ++--
.../src/main/java/net/shibboleth/shared/net/IPRange.java | 2 +-
.../net/shibboleth/shared/net/SimpleURLCanonicalizer.java | 2 +-
.../src/main/java/net/shibboleth/shared/net/URLBuilder.java | 2 +-
.../utilities/java/support/net/CookieBufferingFilter.java | 4 ++--
.../java/support/net/DynamicResponseHeaderFilter.java | 2 +-
.../java/support/net/SameSiteCookieHeaderFilter.java | 4 ++--
.../java/net/shibboleth/shared/security/DataSealer.java | 4 ++--
.../shibboleth/shared/security/DataSealerKeyStrategy.java | 2 +-
.../shared/security/IdentifierGenerationStrategy.java | 2 +-
.../shared/security/impl/BasicAccessControlService.java | 2 +-
.../shared/security/impl/BasicKeystoreKeyStrategy.java | 4 ++--
.../shared/security/impl/BasicKeystoreKeyStrategyTool.java | 4 ++--
.../impl/FixedStringIdentifierGenerationStrategy.java | 2 +-
.../shared/security/impl/IPRangeAccessControl.java | 2 +-
.../security/impl/RandomIdentifierGenerationStrategy.java | 2 +-
.../shared/security/impl/ScriptedKeyStrategy.java | 6 +++---
.../impl/SecureRandomIdentifierGenerationStrategy.java | 2 +-
.../security/impl/SelfSignedCertificateGenerator.java | 6 +++---
.../impl/Type4UUIDIdentifierGenerationStrategy.java | 2 +-
.../java/net/shibboleth/shared/security/DataSealerTest.java | 2 +-
.../shared/service/AbstractReloadableService.java | 2 +-
.../shared/service/ReloadableServiceGaugeSet.java | 10 +++++-----
.../shared/service/impl/LogbackLoggingService.java | 4 ++--
.../shared/service/reloadable/ProxiedFactoryBean.java | 4 ++--
.../shared/service/reloadable/ReloadableScope.java | 4 ++--
.../security/impl/DelegatingAccessControlService.java | 2 +-
.../security/impl/ReloadingAccessControlService.java | 2 +-
.../security/impl/ServiceableAccessControlService.java | 2 +-
.../shared/spring/service/ClassBasedServiceStrategy.java | 2 +-
.../shared/spring/service/ReloadableSpringService.java | 4 ++--
.../shared/spring/service/NonReloadableTestBean.java | 2 +-
.../shared/spring/service/ReloadableTestBean.java | 2 +-
.../shared/spring/config/DeprecatedBeanDetector.java | 2 +-
.../shared/spring/config/IdentifiedComponentManager.java | 2 +-
.../spring/config/RelocatedBeanFactoryPostProcessor.java | 4 ++--
.../AbstractPropertiesApplicationContextInitializer.java | 8 ++++----
.../shared/spring/custom/BaseSpringNamespaceHandler.java | 6 +++---
.../shared/spring/custom/SecondaryNamespaceHandler.java | 2 +-
.../expression/AbstractSpringExpressionEvaluator.java | 4 ++--
.../spring/expression/SpringExpressionBiConsumer.java | 4 ++--
.../spring/expression/SpringExpressionBiFunction.java | 4 ++--
.../spring/expression/SpringExpressionBiPredicate.java | 4 ++--
.../shared/spring/expression/SpringExpressionConsumer.java | 4 ++--
.../shared/spring/expression/SpringExpressionFunction.java | 4 ++--
.../shared/spring/expression/SpringExpressionPredicate.java | 4 ++--
.../shared/spring/resource/ConditionalResource.java | 4 ++--
.../shared/spring/resource/ConditionalResourceResolver.java | 2 +-
.../shibboleth/shared/spring/resource/ResourceHelper.java | 2 +-
.../shared/spring/resource/RunnableFileSystemResource.java | 4 ++--
.../spring/util/AnnotationParameterNameDiscoverer.java | 2 +-
.../shared/spring/util/ApplicationContextBuilder.java | 4 ++--
.../net/shibboleth/shared/spring/util/SpringSupport.java | 4 ++--
.../spring/config/IdentifiedComponentManagerTest.java | 2 +-
.../shared/spring/custom/LowerParsersAndBean.java | 2 +-
.../java/net/shibboleth/shared/spring/util/ParamClass.java | 2 +-
.../java/support => shared}/annotation/ParameterName.java | 2 +-
.../java/support => shared}/annotation/Prototype.java | 2 +-
.../java/support => shared}/annotation/constraint/Live.java | 2 +-
.../support => shared}/annotation/constraint/Negative.java | 2 +-
.../annotation/constraint/NonNegative.java | 2 +-
.../annotation/constraint/NonPositive.java | 2 +-
.../annotation/constraint/NonnullAfterInit.java | 2 +-
.../annotation/constraint/NonnullElements.java | 2 +-
.../support => shared}/annotation/constraint/NotEmpty.java | 2 +-
.../support => shared}/annotation/constraint/NotLive.java | 2 +-
.../annotation/constraint/NullableElements.java | 2 +-
.../support => shared}/annotation/constraint/Positive.java | 2 +-
.../annotation/constraint/ThreadSafeAfterInit.java | 2 +-
.../annotation/constraint/Unmodifiable.java | 2 +-
.../annotation/constraint/package-info.java | 2 +-
.../java/support => shared}/annotation/package-info.java | 2 +-
.../utilities/java/support/codec/StringDigester.java | 4 ++--
.../java/support/collection/ClassToInstanceMultiMap.java | 6 +++---
.../support/collection/LockableClassToInstanceMultiMap.java | 6 +++---
.../AbstractIdentifiableInitializableComponent.java | 2 +-
.../component/AbstractIdentifiedInitializableComponent.java | 4 ++--
.../java/support/component/IdentifiableComponent.java | 2 +-
.../utilities/java/support/logic/BiFunctionSupport.java | 2 +-
.../utilities/java/support/logic/FunctionSupport.java | 2 +-
.../java/support/logic/PredicateDrivenFunction.java | 2 +-
.../utilities/java/support/logic/RegexPredicate.java | 2 +-
.../utilities/java/support/logic/ScriptedBiConsumer.java | 4 ++--
.../utilities/java/support/logic/ScriptedBiFunction.java | 4 ++--
.../utilities/java/support/logic/ScriptedBiPredicate.java | 4 ++--
.../utilities/java/support/logic/ScriptedConsumer.java | 4 ++--
.../utilities/java/support/logic/ScriptedFunction.java | 4 ++--
.../utilities/java/support/logic/ScriptedPredicate.java | 4 ++--
.../java/support/logic/StrategyIndirectedPredicate.java | 2 +-
.../java/support/logic/TrimOrNullStringFunction.java | 2 +-
.../java/support/primitive/DeprecationSupport.java | 4 ++--
.../utilities/java/support/primitive/LangBearingString.java | 2 +-
.../utilities/java/support/primitive/StringSupport.java | 4 ++--
.../utilities/java/support/primitive/TimerSupport.java | 2 +-
.../utilities/java/support/resolver/ClassCriterion.java | 2 +-
.../utilities/java/support/resolver/Resolver.java | 2 +-
.../utilities/java/support/resource/Resource.java | 13 +++++++------
.../java/support/scripting/AbstractScriptEvaluator.java | 6 +++---
.../utilities/java/support/scripting/EvaluableScript.java | 4 ++--
.../utilities/java/support/scripting/ScriptedRunnable.java | 2 +-
.../utilities/java/support/xml/BasicParserPool.java | 8 ++++----
.../shibboleth/utilities/java/support/xml/QNameSupport.java | 2 +-
.../utilities/java/support/xml/SchemaBuilder.java | 6 +++---
.../utilities/java/support/xml/SimpleNamespaceContext.java | 2 +-
.../utilities/java/support/primitive/StringSupportTest.java | 2 +-
.../java/support/scripting/EvaluableScriptTest.java | 2 +-
.../utilities/java/support/xml/AttributeSupportTest.java | 2 +-
.../utilities/java/support/xml/BasicParserPoolTest.java | 2 +-
.../utilities/java/support/xml/ElementSupportTest.java | 2 +-
.../utilities/java/support/xml/QNameSupportTest.java | 2 +-
.../net/shibboleth/shared/testing/RepositorySupport.java | 2 +-
.../shared/spring/velocity/SpringResourceLoader.java | 2 +-
.../main/java/net/shibboleth/shared/velocity/Template.java | 2 +-
124 files changed, 198 insertions(+), 197 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 f445854b..6959af24 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
@@ -37,13 +37,13 @@ import org.springframework.core.io.support.ResourcePropertySource;
import com.beust.jcommander.JCommander;
+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.spring.context.FilesystemGenericApplicationContext;
import net.shibboleth.shared.spring.resource.PreferFileSystemResourceLoader;
import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
-import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
diff --git a/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLineArguments.java b/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLineArguments.java
index df7cc5a4..84e92e50 100644
--- a/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLineArguments.java
+++ b/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLineArguments.java
@@ -31,9 +31,9 @@ import org.slf4j.Logger;
import com.beust.jcommander.Parameter;
import com.google.common.base.Strings;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
-import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NotLive;
+import net.shibboleth.shared.annotation.constraint.Unmodifiable;
/** Command line arguments base class for the {@link AbstractCommandLine} class. */
public abstract class AbstractCommandLineArguments implements CommandLineArguments {
diff --git a/shib-cli/src/main/java/net/shibboleth/shared/cli/CommandLineArguments.java b/shib-cli/src/main/java/net/shibboleth/shared/cli/CommandLineArguments.java
index 3f0d8da1..09a0fa21 100644
--- a/shib-cli/src/main/java/net/shibboleth/shared/cli/CommandLineArguments.java
+++ b/shib-cli/src/main/java/net/shibboleth/shared/cli/CommandLineArguments.java
@@ -23,8 +23,8 @@ import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
-import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.annotation.constraint.NotLive;
+import net.shibboleth.shared.annotation.constraint.Unmodifiable;
/** Command line arguments interface for command line tools. */
public interface CommandLineArguments {
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 0165de90..d1064c69 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
@@ -26,8 +26,8 @@ import java.net.URL;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import org.apache.http.HttpResponse;
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 55f58420..83a05f46 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
@@ -47,9 +47,9 @@ import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.io.Resource;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.httpclient.HttpClientContextHandler;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiedInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
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 52000a33..2739e7d2 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
@@ -19,7 +19,7 @@ package net.shibboleth.shared.spring.httpclient.resource;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
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 61597603..047f3599 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
@@ -39,7 +39,7 @@ import org.apache.http.protocol.HttpContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.DestroyedComponentException;
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 34498e3c..ee235f82 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
@@ -41,9 +41,9 @@ import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.util.CharsetUtils;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
-import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NotLive;
+import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
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 53e6f660..0ad59162 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
@@ -48,7 +48,7 @@ import org.apache.http.util.CharArrayBuffer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
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 b914574e..0b45486c 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
@@ -34,7 +34,7 @@ import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
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 7116b717..3216fc26 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
@@ -25,8 +25,8 @@ import javax.annotation.Nullable;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/HttpServletSupport.java b/shib-networking/src/main/java/net/shibboleth/shared/net/HttpServletSupport.java
index e3366de8..1efde5e9 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/HttpServletSupport.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/HttpServletSupport.java
@@ -34,8 +34,8 @@ import com.google.common.net.MediaType;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/** Utilities for working with HTTP Servlet requests and responses. */
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/IPRange.java b/shib-networking/src/main/java/net/shibboleth/shared/net/IPRange.java
index 105dc04e..1fe69583 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/IPRange.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/IPRange.java
@@ -24,7 +24,7 @@ import java.util.BitSet;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/** Represents a range of IP addresses. */
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 8e6bd610..43a53d1c 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
@@ -26,7 +26,7 @@ import javax.annotation.Nullable;
import com.google.common.base.Strings;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/URLBuilder.java b/shib-networking/src/main/java/net/shibboleth/shared/net/URLBuilder.java
index 92550d7e..7524d7ae 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/URLBuilder.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/URLBuilder.java
@@ -27,7 +27,7 @@ import javax.annotation.Nullable;
import com.google.common.base.Strings;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java
index 0d42e463..d9d82985 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java
+++ b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java
@@ -35,8 +35,8 @@ import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponseWrapper;
-import net.shibboleth.utilities.java.support.annotation.constraint.Live;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.Live;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
/**
* Implementation of an HTTP servlet {@link Filter} which wraps the {@link HttpServletResponse} via
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/DynamicResponseHeaderFilter.java b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/DynamicResponseHeaderFilter.java
index 22bd508a..27350bd7 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/DynamicResponseHeaderFilter.java
+++ b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/DynamicResponseHeaderFilter.java
@@ -39,7 +39,7 @@ import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponseWrapper;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
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 2786ff47..57137b87 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
@@ -45,8 +45,8 @@ import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponseWrapper;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+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.utilities.java.support.primitive.StringSupport;
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 ff5d644d..d00ccf15 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
@@ -44,8 +44,8 @@ import org.apache.commons.codec.binary.Base64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerKeyStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerKeyStrategy.java
index e5e4c605..f658c9f1 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerKeyStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerKeyStrategy.java
@@ -22,7 +22,7 @@ import java.security.KeyException;
import javax.annotation.Nonnull;
import javax.crypto.SecretKey;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.collection.Pair;
/**
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/IdentifierGenerationStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/IdentifierGenerationStrategy.java
index 310746fc..46ae6992 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/IdentifierGenerationStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/IdentifierGenerationStrategy.java
@@ -19,7 +19,7 @@ package net.shibboleth.shared.security;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
/**
* Interface for identifier generators. This identifier can be used for things like digital signature identifiers,
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicAccessControlService.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicAccessControlService.java
index 38486d8e..ad262d4b 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicAccessControlService.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicAccessControlService.java
@@ -28,9 +28,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jakarta.servlet.ServletRequest;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.security.AccessControl;
import net.shibboleth.shared.security.AccessControlService;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
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 baa9afbc..3910196d 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
@@ -40,10 +40,10 @@ import javax.crypto.SecretKey;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.security.DataSealerKeyStrategy;
import net.shibboleth.shared.security.KeyNotFoundException;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
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 c25b1fba..ac71be29 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
@@ -29,8 +29,8 @@ import javax.annotation.Nullable;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.Positive;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
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 c3eef17f..a52264d9 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
@@ -19,8 +19,8 @@ package net.shibboleth.shared.security.impl;
import javax.annotation.Nonnull;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.security.IdentifierGenerationStrategy;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
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 d10b3ecf..df614dc6 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
@@ -30,10 +30,10 @@ import org.slf4j.LoggerFactory;
import com.google.common.net.InetAddresses;
import jakarta.servlet.ServletRequest;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.net.HttpServletSupport;
import net.shibboleth.shared.net.IPRange;
import net.shibboleth.shared.security.AccessControl;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
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 bdf76039..b373823d 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
@@ -23,8 +23,8 @@ import java.util.Random;
import javax.annotation.Nonnull;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.security.IdentifierGenerationStrategy;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import org.apache.commons.codec.BinaryEncoder;
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 148069cd..0f275566 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
@@ -34,10 +34,10 @@ import javax.script.SimpleScriptContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import net.shibboleth.shared.annotation.constraint.NonNegative;
+import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.security.DataSealerKeyStrategy;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonNegative;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategy.java
index 3466160f..d9b9163f 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategy.java
@@ -23,7 +23,7 @@ import javax.annotation.Nonnull;
import org.apache.commons.codec.BinaryEncoder;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
+import net.shibboleth.shared.annotation.ParameterName;
/**
* A specialized subclass of {@link RandomIdentifierGenerationStrategy} which constrains the supplied
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 e990550e..026ee380 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
@@ -37,9 +37,9 @@ import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.Positive;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/Type4UUIDIdentifierGenerationStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/Type4UUIDIdentifierGenerationStrategy.java
index 0f83a83e..d2e9ad3c 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/Type4UUIDIdentifierGenerationStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/Type4UUIDIdentifierGenerationStrategy.java
@@ -22,8 +22,8 @@ import java.util.UUID;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.security.IdentifierGenerationStrategy;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
/** Generates a type 4 UUID as an identifier. */
@ThreadSafe
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 62710aef..4d5270f8 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
@@ -17,8 +17,8 @@
package net.shibboleth.shared.security;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.security.impl.BasicKeystoreKeyStrategy;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.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 3dd628b0..93b50bc2 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
@@ -28,7 +28,7 @@ import javax.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.UnmodifiableComponent;
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 53d56b4d..9f7a6b5f 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
@@ -29,11 +29,11 @@ import com.codahale.metrics.MetricFilter;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.MetricSet;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.Live;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.Live;
+import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
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 ec95979e..c4366fd1 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
@@ -36,12 +36,12 @@ import ch.qos.logback.core.joran.spi.JoranException;
import ch.qos.logback.core.status.ErrorStatus;
import ch.qos.logback.core.status.InfoStatus;
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.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.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
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 326f8374..4bb0e47a 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
@@ -25,10 +25,10 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.config.AbstractFactoryBean;
import org.springframework.context.ApplicationContext;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.shared.service.ServiceableComponent;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
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 5d641e8c..b3dbb43e 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
@@ -19,10 +19,10 @@ package net.shibboleth.shared.service.reloadable;
import javax.annotation.Nonnull;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.shared.service.ServiceableComponent;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import org.slf4j.Logger;
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 6bd2b180..f1ffa501 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
@@ -24,11 +24,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jakarta.servlet.ServletRequest;
+import net.shibboleth.shared.annotation.ParameterName;
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.annotation.ParameterName;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
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 65748032..855793c8 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
@@ -19,10 +19,10 @@ package net.shibboleth.shared.service.security.impl;
import javax.annotation.Nonnull;
+import net.shibboleth.shared.annotation.ParameterName;
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.annotation.ParameterName;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
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 0b424307..a9943090 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
@@ -19,10 +19,10 @@ package net.shibboleth.shared.service.security.impl;
import javax.annotation.Nonnull;
+import net.shibboleth.shared.annotation.ParameterName;
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.annotation.ParameterName;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
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 e00f50e6..d825eef1 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
@@ -25,9 +25,9 @@ import javax.annotation.Nullable;
import org.springframework.context.ApplicationContext;
+import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.service.ServiceException;
import net.shibboleth.shared.service.ServiceableComponent;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
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 6cea08a7..57389177 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
@@ -42,12 +42,12 @@ import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.io.Resource;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
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.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-service/src/test/java/net/shibboleth/shared/spring/service/NonReloadableTestBean.java b/shib-service/src/test/java/net/shibboleth/shared/spring/service/NonReloadableTestBean.java
index 1bf78ac8..d3807d39 100644
--- a/shib-service/src/test/java/net/shibboleth/shared/spring/service/NonReloadableTestBean.java
+++ b/shib-service/src/test/java/net/shibboleth/shared/spring/service/NonReloadableTestBean.java
@@ -23,7 +23,7 @@ import javax.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
diff --git a/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableTestBean.java b/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableTestBean.java
index f982666c..fd59e62e 100644
--- a/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableTestBean.java
+++ b/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableTestBean.java
@@ -22,7 +22,7 @@ import javax.annotation.Nonnull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/DeprecatedBeanDetector.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/DeprecatedBeanDetector.java
index 2e2f9222..a66a5c9a 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/DeprecatedBeanDetector.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/DeprecatedBeanDetector.java
@@ -27,7 +27,7 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiedComponentManager.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiedComponentManager.java
index bc34ce15..36efc20c 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiedComponentManager.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/IdentifiedComponentManager.java
@@ -29,7 +29,7 @@ import javax.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
/**
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessor.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessor.java
index 19f23120..aaf954be 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessor.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/RelocatedBeanFactoryPostProcessor.java
@@ -28,8 +28,8 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
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 b624169e..8499d7a1 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
@@ -46,10 +46,10 @@ import org.springframework.core.env.PropertiesPropertySource;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
-import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+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.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/BaseSpringNamespaceHandler.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/BaseSpringNamespaceHandler.java
index 38baacd3..421c12d3 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/BaseSpringNamespaceHandler.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/custom/BaseSpringNamespaceHandler.java
@@ -44,9 +44,9 @@ import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+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.primitive.StringSupport;
import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
import net.shibboleth.utilities.java.support.xml.QNameSupport;
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 c2afae5a..890a87ca 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
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
import org.springframework.beans.factory.xml.BeanDefinitionParser;
import org.w3c.dom.Element;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
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 ad7df9f2..9b321524 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
@@ -27,8 +27,8 @@ import org.springframework.expression.ExpressionParser;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.StandardEvaluationContext;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiConsumer.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiConsumer.java
index b05a928e..72bd02f2 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiConsumer.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiConsumer.java
@@ -26,8 +26,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.expression.EvaluationContext;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.collection.Pair;
/**
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiFunction.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiFunction.java
index 21665305..f79f2dbe 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiFunction.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiFunction.java
@@ -26,8 +26,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.expression.EvaluationContext;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.collection.Pair;
/**
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiPredicate.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiPredicate.java
index cbde285c..25954088 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiPredicate.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiPredicate.java
@@ -26,8 +26,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.expression.EvaluationContext;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.collection.Pair;
/**
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionConsumer.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionConsumer.java
index a6badd83..87f4b3c1 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionConsumer.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionConsumer.java
@@ -26,8 +26,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.expression.EvaluationContext;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
/**
* Predicate whose condition is defined by an Spring EL expression.
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionFunction.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionFunction.java
index aa6e5305..efbba424 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionFunction.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionFunction.java
@@ -26,8 +26,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.expression.EvaluationContext;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
/**
* Function whose output is defined by an Spring EL expression.
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionPredicate.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionPredicate.java
index a399bd02..1d4230f3 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionPredicate.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionPredicate.java
@@ -24,8 +24,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.expression.EvaluationContext;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Predicate;
/**
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 2fd1ef9f..474f443a 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
@@ -33,8 +33,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.core.io.Resource;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiedInitializableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResourceResolver.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResourceResolver.java
index 16978de3..b0651b5a 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResourceResolver.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResourceResolver.java
@@ -23,7 +23,7 @@ import org.springframework.core.io.ProtocolResolver;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
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 c2218377..3fe30339 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
@@ -25,7 +25,7 @@ import java.net.URL;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
+import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.utilities.java.support.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 2ec76756..72052de5 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
@@ -28,8 +28,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.core.io.FileSystemResource;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resource.Resource;
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/util/AnnotationParameterNameDiscoverer.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/AnnotationParameterNameDiscoverer.java
index a7c8dcd4..6a49c030 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/util/AnnotationParameterNameDiscoverer.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/AnnotationParameterNameDiscoverer.java
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.core.DefaultParameterNameDiscoverer;
import org.springframework.core.ParameterNameDiscoverer;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
+import net.shibboleth.shared.annotation.ParameterName;
/**
* An implementation of {@link ParameterNameDiscoverer} that is driven by the {@link ParameterName} Annotation.
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 e9c72174..c48736e6 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
@@ -28,6 +28,8 @@ import java.util.stream.Collectors;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.spring.config.BooleanToPredicateConverter;
import net.shibboleth.shared.spring.config.FunctionToFunctionConverter;
import net.shibboleth.shared.spring.config.PredicateToPredicateConverter;
@@ -39,8 +41,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.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
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 ac4805bc..5cc92884 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
@@ -49,10 +49,10 @@ import org.xml.sax.InputSource;
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.net.HttpServletSupport;
import net.shibboleth.shared.spring.context.FilesystemGenericApplicationContext;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.xml.SerializeSupport;
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiedComponentManagerTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiedComponentManagerTest.java
index f0f65360..9d2c9d48 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiedComponentManagerTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/config/IdentifiedComponentManagerTest.java
@@ -29,8 +29,8 @@ import org.springframework.context.support.GenericApplicationContext;
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
/**
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/LowerParsersAndBean.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/LowerParsersAndBean.java
index db32f25c..1564fce0 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/LowerParsersAndBean.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/custom/LowerParsersAndBean.java
@@ -27,10 +27,10 @@ import org.springframework.beans.factory.xml.BeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
import net.shibboleth.shared.spring.custom.BaseSpringNamespaceHandler;
import net.shibboleth.shared.spring.util.SpringSupport;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.xml.AttributeSupport;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/util/ParamClass.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/util/ParamClass.java
index b65c6a5b..e363893a 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/util/ParamClass.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/util/ParamClass.java
@@ -17,7 +17,7 @@
package net.shibboleth.shared.spring.util;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
+import net.shibboleth.shared.annotation.ParameterName;
/**
* simple bean.
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/ParameterName.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/ParameterName.java
similarity index 96%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/ParameterName.java
rename to shib-support/src/main/java/net/shibboleth/shared/annotation/ParameterName.java
index 64e69b65..f9a3d97b 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/ParameterName.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/ParameterName.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.annotation;
+package net.shibboleth.shared.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/Prototype.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/Prototype.java
similarity index 95%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/Prototype.java
rename to shib-support/src/main/java/net/shibboleth/shared/annotation/Prototype.java
index 63fd33b4..f48f14f4 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/Prototype.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/Prototype.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.annotation;
+package net.shibboleth.shared.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Live.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Live.java
similarity index 95%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Live.java
rename to shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Live.java
index 6269aaa6..7abe96a6 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Live.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Live.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.annotation.constraint;
+package net.shibboleth.shared.annotation.constraint;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Negative.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Negative.java
similarity index 94%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Negative.java
rename to shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Negative.java
index 83a50df3..e4ea3626 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Negative.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Negative.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.annotation.constraint;
+package net.shibboleth.shared.annotation.constraint;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonNegative.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonNegative.java
similarity index 94%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonNegative.java
rename to shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonNegative.java
index dc106a68..bff86825 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonNegative.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonNegative.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.annotation.constraint;
+package net.shibboleth.shared.annotation.constraint;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonPositive.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonPositive.java
similarity index 94%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonPositive.java
rename to shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonPositive.java
index 901cd964..f5e0e90e 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonPositive.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonPositive.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.annotation.constraint;
+package net.shibboleth.shared.annotation.constraint;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonnullAfterInit.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullAfterInit.java
similarity index 94%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonnullAfterInit.java
rename to shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullAfterInit.java
index 395decd6..95d4cb8b 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonnullAfterInit.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullAfterInit.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.annotation.constraint;
+package net.shibboleth.shared.annotation.constraint;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonnullElements.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullElements.java
similarity index 95%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonnullElements.java
rename to shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullElements.java
index 28fa0f91..6c52d4a5 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NonnullElements.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NonnullElements.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.annotation.constraint;
+package net.shibboleth.shared.annotation.constraint;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NotEmpty.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NotEmpty.java
similarity index 94%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NotEmpty.java
rename to shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NotEmpty.java
index 3318c553..9210806c 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NotEmpty.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NotEmpty.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.annotation.constraint;
+package net.shibboleth.shared.annotation.constraint;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NotLive.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NotLive.java
similarity index 95%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NotLive.java
rename to shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NotLive.java
index 066ec1c2..761827f4 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NotLive.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NotLive.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.annotation.constraint;
+package net.shibboleth.shared.annotation.constraint;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NullableElements.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NullableElements.java
similarity index 94%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NullableElements.java
rename to shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NullableElements.java
index 660877d4..1d7c39ac 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/NullableElements.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/NullableElements.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.annotation.constraint;
+package net.shibboleth.shared.annotation.constraint;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Positive.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Positive.java
similarity index 94%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Positive.java
rename to shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Positive.java
index 3e2d8e35..2559fc6b 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Positive.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Positive.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.annotation.constraint;
+package net.shibboleth.shared.annotation.constraint;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/ThreadSafeAfterInit.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/ThreadSafeAfterInit.java
similarity index 95%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/ThreadSafeAfterInit.java
rename to shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/ThreadSafeAfterInit.java
index c5af47fd..c2fbf127 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/ThreadSafeAfterInit.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/ThreadSafeAfterInit.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.annotation.constraint;
+package net.shibboleth.shared.annotation.constraint;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Unmodifiable.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Unmodifiable.java
similarity index 94%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Unmodifiable.java
rename to shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Unmodifiable.java
index 1f3f5f9f..3f239884 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/Unmodifiable.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/Unmodifiable.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.annotation.constraint;
+package net.shibboleth.shared.annotation.constraint;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/package-info.java
similarity index 94%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/package-info.java
rename to shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/package-info.java
index 5423f091..76f24000 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/constraint/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/constraint/package-info.java
@@ -20,4 +20,4 @@
* for documentation purposes only. They do not have any effect on the executing code. Use a JSR-303 implementation
* if that's what you're after.
*/
-package net.shibboleth.utilities.java.support.annotation.constraint;
\ No newline at end of file
+package net.shibboleth.shared.annotation.constraint;
\ No newline at end of file
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/annotation/package-info.java
similarity index 94%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/package-info.java
rename to shib-support/src/main/java/net/shibboleth/shared/annotation/package-info.java
index b3967215..8b2b7cc0 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/annotation/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/annotation/package-info.java
@@ -18,4 +18,4 @@
/**
* A set of annotations used to document information about methods, fields, parameters, etc.
*/
-package net.shibboleth.utilities.java.support.annotation;
\ No newline at end of file
+package net.shibboleth.shared.annotation;
\ No newline at end of file
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java
index c734af8d..c35b6152 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java
@@ -25,8 +25,8 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java
index 54cdf787..b45c57bb 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMap.java
@@ -17,9 +17,9 @@
package net.shibboleth.utilities.java.support.collection;
-import net.shibboleth.utilities.java.support.annotation.constraint.Live;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+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 java.util.ArrayList;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/LockableClassToInstanceMultiMap.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/LockableClassToInstanceMultiMap.java
index 38fcd0cd..41ea5b31 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/LockableClassToInstanceMultiMap.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/collection/LockableClassToInstanceMultiMap.java
@@ -27,9 +27,9 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.annotation.constraint.Live;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.annotation.constraint.Live;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.Unmodifiable;
/**
* A specialization of {@link ClassToInstanceMultiMap} which exposes a map-specific
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableInitializableComponent.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableInitializableComponent.java
index 6f4f26a9..93fe79e0 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableInitializableComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableInitializableComponent.java
@@ -20,7 +20,7 @@ package net.shibboleth.utilities.java.support.component;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
/**
* An {@link AbstractIdentifiedInitializableComponent} with a public setter.
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponent.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponent.java
index 47297431..7b0dff65 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiedInitializableComponent.java
@@ -22,8 +22,8 @@ import javax.annotation.Nullable;
import javax.annotation.concurrent.GuardedBy;
import javax.annotation.concurrent.ThreadSafe;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/IdentifiableComponent.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/IdentifiableComponent.java
index 1fe0cca3..5b8b7b0e 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/IdentifiableComponent.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/component/IdentifiableComponent.java
@@ -19,7 +19,7 @@ package net.shibboleth.utilities.java.support.component;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
/** A {@link Component} whose identifier can be set. */
public interface IdentifiableComponent extends IdentifiedComponent {
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/BiFunctionSupport.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/BiFunctionSupport.java
index c3ce5edc..4d2ff2e9 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/BiFunctionSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/BiFunctionSupport.java
@@ -23,7 +23,7 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
+import net.shibboleth.shared.annotation.ParameterName;
/**
* Helper class for constructing {@link BiFunction}s in a Spring-friendly manner.
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 62228beb..69508162 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
@@ -24,7 +24,7 @@ import javax.annotation.Nullable;
import com.google.common.base.Functions;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
+import net.shibboleth.shared.annotation.ParameterName;
/**
* Helper class for constructing functions that are fully generic, in contrast to the broken,
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateDrivenFunction.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateDrivenFunction.java
index 0ef0c718..6b0a446b 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateDrivenFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateDrivenFunction.java
@@ -24,7 +24,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
+import net.shibboleth.shared.annotation.ParameterName;
/**
* A {@link Function} that runs a {@link Predicate} and then runs one of two other possible
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/RegexPredicate.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/RegexPredicate.java
index 0be2b926..e0ce2279 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/RegexPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/RegexPredicate.java
@@ -21,7 +21,7 @@ import java.util.regex.Pattern;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
/**
* A {@link Predicate} that checks that a given input string matches a regular expression. If a given
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java
index d2abaee7..e70d50b8 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java
@@ -27,8 +27,8 @@ import javax.annotation.Nullable;
import javax.script.ScriptContext;
import javax.script.ScriptException;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.resource.Resource;
import net.shibboleth.utilities.java.support.scripting.AbstractScriptEvaluator;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiFunction.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiFunction.java
index 54e5c0e4..26c94ceb 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiFunction.java
@@ -27,8 +27,8 @@ import javax.annotation.Nullable;
import javax.script.ScriptContext;
import javax.script.ScriptException;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.resource.Resource;
import net.shibboleth.utilities.java.support.scripting.AbstractScriptEvaluator;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java
index 4b9d4bf7..ccdb3739 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java
@@ -27,8 +27,8 @@ import javax.annotation.Nullable;
import javax.script.ScriptContext;
import javax.script.ScriptException;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.resource.Resource;
import net.shibboleth.utilities.java.support.scripting.AbstractScriptEvaluator;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedConsumer.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedConsumer.java
index 7c8a267d..de2a5929 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedConsumer.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedConsumer.java
@@ -27,8 +27,8 @@ import javax.annotation.Nullable;
import javax.script.ScriptContext;
import javax.script.ScriptException;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.resource.Resource;
import net.shibboleth.utilities.java.support.scripting.AbstractScriptEvaluator;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java
index 072f286b..c9449488 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java
@@ -27,8 +27,8 @@ import javax.annotation.Nullable;
import javax.script.ScriptContext;
import javax.script.ScriptException;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.resource.Resource;
import net.shibboleth.utilities.java.support.scripting.AbstractScriptEvaluator;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
index a503d011..0650bc8a 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
@@ -26,8 +26,8 @@ import javax.annotation.Nullable;
import javax.script.ScriptContext;
import javax.script.ScriptException;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.resource.Resource;
import net.shibboleth.utilities.java.support.scripting.AbstractScriptEvaluator;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/StrategyIndirectedPredicate.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/StrategyIndirectedPredicate.java
index 68b8faf4..d41234e7 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/StrategyIndirectedPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/StrategyIndirectedPredicate.java
@@ -25,7 +25,7 @@ import javax.annotation.Nullable;
import com.google.common.base.Predicates;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
+import net.shibboleth.shared.annotation.ParameterName;
/**
* Generic predicate that checks a candidate {@link Object} returned by a lookup function
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java
index 5dd51c46..95c31c89 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java
@@ -23,7 +23,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import com.google.common.base.MoreObjects;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/DeprecationSupport.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/DeprecationSupport.java
index ade48723..9d8ed9ff 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/DeprecationSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/DeprecationSupport.java
@@ -26,8 +26,8 @@ import javax.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
/** Helper methods for reporting usage of deprecated features. */
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/LangBearingString.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/LangBearingString.java
index 5b73d5b4..63021496 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/LangBearingString.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/LangBearingString.java
@@ -19,7 +19,7 @@ package net.shibboleth.utilities.java.support.primitive;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.collection.Pair;
/**
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java
index dbc4acb5..4c955c56 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java
@@ -34,8 +34,8 @@ import java.util.stream.Collectors;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
+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;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/TimerSupport.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/TimerSupport.java
index 7b381567..13bb3a2b 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/TimerSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/primitive/TimerSupport.java
@@ -22,7 +22,7 @@ import java.util.Timer;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/ClassCriterion.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/ClassCriterion.java
index e3746c02..fa4d322f 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/ClassCriterion.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/ClassCriterion.java
@@ -19,7 +19,7 @@ package net.shibboleth.utilities.java.support.resolver;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
+import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/Resolver.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/Resolver.java
index d79f9950..6a7dbec6 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/Resolver.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/resolver/Resolver.java
@@ -20,7 +20,7 @@ package net.shibboleth.utilities.java.support.resolver;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
/**
* Generic interface for resolvers which process specified criteria and produce some implementation-specific
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resource/Resource.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/resource/Resource.java
index 1b354c21..69dd1cb2 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/resource/Resource.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/resource/Resource.java
@@ -24,6 +24,7 @@ import java.net.URI;
import java.net.URL;
import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
/**
* An interface representing a data resource.
@@ -76,7 +77,7 @@ public interface Resource {
* descriptor
* @return a URL handle for this resource.
*/
- URL getURL() throws IOException;
+ @Nonnull URL getURL() throws IOException;
/**
* Return a URI handle for this resource.
@@ -85,7 +86,7 @@ public interface Resource {
* descriptor
* @return a URI handle for this resource.
*/
- URI getURI() throws IOException;
+ @Nonnull URI getURI() throws IOException;
/**
* Return a File handle for this resource.
@@ -94,7 +95,7 @@ public interface Resource {
* available in a file system
* @return a File handle for this resource.
*/
- File getFile() throws IOException;
+ @Nonnull File getFile() throws IOException;
/**
* Return an {@link InputStream}.
@@ -135,14 +136,14 @@ public interface Resource {
* @return the resource handle for the relative resource
* @throws IOException if the relative resource cannot be determined
*/
- Resource createRelativeResource(String relativePath) throws IOException;
+ @Nonnull Resource createRelativeResource(String relativePath) throws IOException;
/**
* Determine a filename for this resource, i.e. typically the last part of the path: for example, "myfile.txt".
*
* @return {@code null} if this type of resource does not have a filename, otherwise the file name.
*/
- String getFilename();
+ @Nullable String getFilename();
/**
* Return a description for this resource, to be used for error output when working with the resource.
@@ -154,6 +155,6 @@ public interface Resource {
* @see Object#toString()
* @return a description for this resource.
*/
- String getDescription();
+ @Nonnull String getDescription();
}
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEvaluator.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEvaluator.java
index e7462f94..dde9e1ef 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEvaluator.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEvaluator.java
@@ -27,9 +27,9 @@ import javax.script.ScriptContext;
import javax.script.ScriptException;
import javax.script.SimpleScriptContext;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+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 org.slf4j.Logger;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
index 5ee522d0..8fea6559 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
@@ -37,8 +37,8 @@ import org.slf4j.LoggerFactory;
import com.google.common.io.Files;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/ScriptedRunnable.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/ScriptedRunnable.java
index 03a9d6d9..23c32c4c 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/ScriptedRunnable.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/ScriptedRunnable.java
@@ -24,7 +24,7 @@ import javax.script.ScriptContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.UnmodifiableComponent;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
index 9fa198d4..b12bba34 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
@@ -49,10 +49,10 @@ import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+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.annotation.constraint.Unmodifiable;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java
index 46700487..a31b4171 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java
@@ -23,7 +23,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.xml.namespace.QName;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/SchemaBuilder.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/SchemaBuilder.java
index 0c749ec9..b4600a79 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/SchemaBuilder.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/SchemaBuilder.java
@@ -34,9 +34,9 @@ import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NullableElements;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.resource.Resource;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java
index ad44605a..d95ba4eb 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java
@@ -26,7 +26,7 @@ import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
import javax.xml.namespace.NamespaceContext;
-import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
+import net.shibboleth.shared.annotation.constraint.NullableElements;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import com.google.common.collect.ImmutableBiMap;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/primitive/StringSupportTest.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/primitive/StringSupportTest.java
index a1eae1cf..6576fef3 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/primitive/StringSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/primitive/StringSupportTest.java
@@ -35,7 +35,7 @@ import javax.annotation.Nonnull;
import org.testng.annotations.Test;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
/**
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java
index c7136d3c..42ecafd3 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java
@@ -28,7 +28,7 @@ import java.net.URL;
import javax.annotation.Nonnull;
import javax.script.ScriptException;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.resource.Resource;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java
index 0297514b..b136aace 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java
@@ -29,7 +29,7 @@ import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/BasicParserPoolTest.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/BasicParserPoolTest.java
index 2a4c14fc..c9f5181a 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/BasicParserPoolTest.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/BasicParserPoolTest.java
@@ -34,7 +34,7 @@ import javax.annotation.Nonnull;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.validation.Schema;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.DestroyedComponentException;
import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java
index de383fc3..3d47d317 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java
@@ -27,7 +27,7 @@ import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java
index 7045951c..e292d66d 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java
@@ -24,7 +24,7 @@ import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
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 3c66bd90..2c955ab3 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
@@ -19,7 +19,7 @@ package net.shibboleth.shared.testing;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/SpringResourceLoader.java b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/SpringResourceLoader.java
index 999e1ea8..f2c5d7e3 100644
--- a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/SpringResourceLoader.java
+++ b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/SpringResourceLoader.java
@@ -33,7 +33,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
/**
* Velocity ResourceLoader adapter that loads via a Spring ResourceLoader.
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 fa04c6ef..91b04ab4 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
@@ -25,7 +25,7 @@ import java.util.UUID;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list