[java-shib-metadata] branch main updated: Rename shared annotation packages.
Scott Cantor
cantor.2 at osu.edu
Thu Sep 22 18:11:54 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-metadata.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=571aa5cc8d3501ef7c1270170bf945869d989728
The following commit(s) were added to refs/heads/main by this push:
new 571aa5cc8 Rename shared annotation packages.
571aa5cc8 is described below
commit 571aa5cc8d3501ef7c1270170bf945869d989728
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Sep 22 14:11:52 2022 -0400
Rename shared annotation packages.
---
.../src/main/java/net/shibboleth/idp/saml/metadata/ACSUIInfo.java | 2 +-
.../src/main/java/net/shibboleth/idp/saml/metadata/IdPUIInfo.java | 2 +-
.../java/net/shibboleth/idp/saml/metadata/OrganizationUIInfo.java | 2 +-
.../main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java | 2 +-
.../java/net/shibboleth/idp/saml/security/KeyAuthoritySupport.java | 2 +-
.../src/main/java/net/shibboleth/idp/saml/xml/SAMLConstants.java | 2 +-
.../idp/saml/metadata/impl/MetadataProviderContainer.java | 2 +-
.../idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java | 6 +++---
.../idp/saml/metadata/impl/ReloadableMetadataResolver.java | 2 +-
.../security/impl/MetadataPKIXValidationInformationResolver.java | 2 +-
.../java/net/shibboleth/spring/http/HTTPResourceFactoryBean.java | 4 ++--
.../shibboleth/spring/metadata/AbstractMetadataProviderParser.java | 2 +-
.../spring/metadata/HTTPMetadataProvidersParserSupport.java | 2 +-
.../spring/metadata/NodeProcessingAttachingBeanPostProcessor.java | 2 +-
.../shibboleth/spring/metadata/filter/PredicateFilterParser.java | 2 +-
.../net/shibboleth/spring/security/SecurityNamespaceHandler.java | 2 +-
16 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ACSUIInfo.java b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ACSUIInfo.java
index 6556c3903..12613fa69 100644
--- a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ACSUIInfo.java
+++ b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ACSUIInfo.java
@@ -29,7 +29,7 @@ import org.opensaml.saml.saml2.metadata.LocalizedName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.utilities.java.support.collection.CollectionSupport;
/**
diff --git a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/IdPUIInfo.java b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/IdPUIInfo.java
index 7f0a2e52d..0cb9bb03b 100644
--- a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/IdPUIInfo.java
+++ b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/IdPUIInfo.java
@@ -36,7 +36,7 @@ import org.opensaml.saml.saml2.metadata.LocalizedURI;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.utilities.java.support.collection.CollectionSupport;
/**
diff --git a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfo.java b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfo.java
index 360a3e66d..c38d30795 100644
--- a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfo.java
+++ b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfo.java
@@ -30,7 +30,7 @@ import org.opensaml.saml.saml2.metadata.Organization;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.utilities.java.support.collection.CollectionSupport;
/**
diff --git a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java
index b097f2fef..8c1f5bb65 100644
--- a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java
+++ b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java
@@ -32,7 +32,7 @@ import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.opensaml.saml.saml2.metadata.IDPSSODescriptor;
import net.shibboleth.idp.saml.xmlobject.Scope;
-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-metadata-api/src/main/java/net/shibboleth/idp/saml/security/KeyAuthoritySupport.java b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/security/KeyAuthoritySupport.java
index 89e2cecfe..06a4d8ce7 100644
--- a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/security/KeyAuthoritySupport.java
+++ b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/security/KeyAuthoritySupport.java
@@ -35,7 +35,7 @@ import org.opensaml.xmlsec.keyinfo.KeyInfoSupport;
import org.opensaml.xmlsec.signature.KeyInfo;
import net.shibboleth.idp.saml.xmlobject.KeyAuthority;
-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-metadata-api/src/main/java/net/shibboleth/idp/saml/xml/SAMLConstants.java b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/xml/SAMLConstants.java
index 5a1b9325e..28fad4d35 100644
--- a/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/xml/SAMLConstants.java
+++ b/shib-metadata-api/src/main/java/net/shibboleth/idp/saml/xml/SAMLConstants.java
@@ -19,7 +19,7 @@ package net.shibboleth.idp.saml.xml;
import javax.annotation.Nonnull;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
/** XML related constants used with SAML. */
public final class SAMLConstants {
diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataProviderContainer.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataProviderContainer.java
index 44fe91ce3..222d7b4dd 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataProviderContainer.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataProviderContainer.java
@@ -25,8 +25,8 @@ import org.opensaml.saml.metadata.resolver.MetadataResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java
index a2c56baea..1d549217e 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java
@@ -39,11 +39,11 @@ import com.codahale.metrics.MetricSet;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMap.Builder;
+import net.shibboleth.shared.annotation.ParameterName;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.service.ReloadableServiceGaugeSet;
import net.shibboleth.shared.service.ServiceableComponent;
-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.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadableMetadataResolver.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadableMetadataResolver.java
index 8b4b1380f..405fceea4 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadableMetadataResolver.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadableMetadataResolver.java
@@ -28,9 +28,9 @@ import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import net.shibboleth.shared.annotation.ParameterName;
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;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java
index ba3955cf0..0764d6f08 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
import net.shibboleth.idp.saml.security.KeyAuthoritySupport;
import net.shibboleth.idp.saml.xmlobject.KeyAuthority;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
+import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.utilities.java.support.collection.LockableClassToInstanceMultiMap;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/HTTPResourceFactoryBean.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/HTTPResourceFactoryBean.java
index 45cec07c7..10edc3a51 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/HTTPResourceFactoryBean.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/HTTPResourceFactoryBean.java
@@ -53,11 +53,11 @@ import org.springframework.beans.FatalBeanException;
import org.springframework.beans.factory.config.AbstractFactoryBean;
import org.springframework.core.io.Resource;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.httpclient.HttpClientContextHandler;
import net.shibboleth.shared.spring.httpclient.resource.FileBackedHTTPResource;
import net.shibboleth.shared.spring.httpclient.resource.HTTPResource;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
/**
* Factory bean for simple use cases that auto-configure PKIX or key pinning for
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
index cf1a0abdc..9e9362018 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
@@ -33,9 +33,9 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import net.shibboleth.idp.saml.metadata.impl.MetadataProviderContainer;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.spring.custom.AbstractCustomBeanDefinitionParser;
import net.shibboleth.shared.spring.util.SpringSupport;
-import net.shibboleth.utilities.java.support.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.ElementSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java
index b6b20920b..694bdf1e0 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java
@@ -30,9 +30,9 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.spring.util.SpringSupport;
import net.shibboleth.spring.http.HttpClientFactoryBean;
-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;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/NodeProcessingAttachingBeanPostProcessor.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/NodeProcessingAttachingBeanPostProcessor.java
index 3132b07ad..a80098b4c 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/NodeProcessingAttachingBeanPostProcessor.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/NodeProcessingAttachingBeanPostProcessor.java
@@ -35,7 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.core.Ordered;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java
index 8a38649f6..de793c06f 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/PredicateFilterParser.java
@@ -38,11 +38,11 @@ import org.springframework.beans.factory.support.ManagedList;
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.util.SpringSupport;
import net.shibboleth.spring.ScriptTypeBeanParser;
import net.shibboleth.spring.metadata.AbstractMetadataProviderParser;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.PredicateSupport;
import net.shibboleth.utilities.java.support.logic.ScriptedPredicate;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/SecurityNamespaceHandler.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/SecurityNamespaceHandler.java
index 924e87566..4d8435f69 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/SecurityNamespaceHandler.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/SecurityNamespaceHandler.java
@@ -20,6 +20,7 @@ package net.shibboleth.spring.security;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
+import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.spring.custom.BaseSpringNamespaceHandler;
import net.shibboleth.spring.security.credential.BasicInlineCredentialParser;
import net.shibboleth.spring.security.credential.BasicResourceCredentialParser;
@@ -35,7 +36,6 @@ import net.shibboleth.spring.security.trust.StaticExplicitKeyParser;
import net.shibboleth.spring.security.trust.StaticExplicitKeySignatureParser;
import net.shibboleth.spring.security.trust.StaticPKIXSignatureParser;
import net.shibboleth.spring.security.trust.StaticPKIXX509CredentialParser;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
/** Namespace handler for {@link #SECURITY_NAMESPACE}. */
public class SecurityNamespaceHandler extends BaseSpringNamespaceHandler {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list