[java-identity-provider] 01/02: IDP-1213 Move Consent and ConsentContext classes to api
Rod Widdowson
rdw at steadingsoftware.com
Sat Jun 30 10:09:57 EDT 2018
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=cd0557babd54fcf38a9f56857febffb9bef6d213
commit cd0557babd54fcf38a9f56857febffb9bef6d213
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jun 29 16:24:23 2018 +0100
IDP-1213 Move Consent and ConsentContext classes to api
https://issues.shibboleth.net/jira/browse/IDP-1213
We document the latter and it requires the former.
---
.../system/conf/profile-intercept-system.xml | 2 +-
.../flows/intercept/attribute-release-flow.xml | 2 +-
.../system/flows/intercept/terms-of-use-flow.xml | 2 +-
.../idp/test/flows/cas/LoginFlowTest.java | 2 +-
.../java/net/shibboleth/idp/consent}/Consent.java | 2 +-
.../idp/consent/context}/ConsentContext.java | 4 +-
.../net/shibboleth/idp/consent/package-info.java | 25 +-----
.../idp/consent/audit/impl/ConsentAuditFields.java | 2 +-
.../impl/CurrentConsentIdsAuditExtractor.java | 2 +-
.../CurrentConsentIsApprovedAuditExtractor.java | 4 +-
.../impl/CurrentConsentValuesAuditExtractor.java | 4 +-
.../idp/consent/context/impl/ConsentContext.java | 59 +------------
.../consent/flow/ar/impl/ReleaseAttributes.java | 2 +-
.../consent/flow/impl/AbstractConsentAction.java | 2 +-
.../idp/consent/flow/impl/ExtractConsent.java | 4 +-
.../flow/impl/InitializeConsentContext.java | 2 +-
.../consent/flow/impl/PopulateConsentContext.java | 2 +-
.../storage/impl/CreateGlobalConsentResult.java | 2 +-
.../consent/flow/storage/impl/CreateResult.java | 2 +-
.../flow/storage/impl/ReadConsentFromStorage.java | 2 +-
.../net/shibboleth/idp/consent/impl/Consent.java | 98 +---------------------
.../impl/AttributeReleaseConsentFunction.java | 4 +-
.../impl/GlobalAttributeConsentPredicate.java | 4 +-
.../logic/impl/IsConsentRequiredPredicate.java | 4 +-
.../logic/impl/MessageSourceConsentFunction.java | 2 +-
.../consent/storage/impl/ConsentSerializer.java | 2 +-
.../impl/AbstractConsentAuditExtractorTest.java | 2 +-
.../impl/CurrentConsentIdsAuditExtractorTest.java | 4 +-
...CurrentConsentIsApprovedAuditExtractorTest.java | 4 +-
.../CurrentConsentValuesAuditExtractorTest.java | 4 +-
.../consent/context/impl/ConsentContextTest.java | 3 +-
.../flow/ar/impl/ReleaseAttributesTest.java | 4 +-
.../flow/impl/AbstractConsentActionTest.java | 2 +-
.../idp/consent/flow/impl/ExtractConsentTest.java | 4 +-
.../flow/impl/InitializeConsentContextTest.java | 2 +-
.../flow/impl/PopulateConsentContextTest.java | 4 +-
.../impl/AbstractConsentStorageActionTest.java | 2 +-
.../impl/CreateGlobalConsentResultTest.java | 2 +-
.../flow/storage/impl/CreateResultTest.java | 4 +-
.../storage/impl/ReadConsentFromStorageTest.java | 2 +-
.../shibboleth/idp/consent/impl/ConsentTest.java | 1 +
.../idp/consent/impl/ConsentTestingSupport.java | 1 +
.../impl/AttributeReleaseConsentFunctionTest.java | 4 +-
.../impl/GlobalAttributeConsentPredicateTest.java | 4 +-
.../logic/impl/IsConsentRequiredPredicateTest.java | 4 +-
.../impl/MessageSourceConsentFunctionTest.java | 2 +-
.../storage/impl/ConsentSerializerTest.java | 2 +-
47 files changed, 70 insertions(+), 233 deletions(-)
diff --git a/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml b/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml
index 87501a2..f77dc1b 100644
--- a/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml
+++ b/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml
@@ -83,7 +83,7 @@
<constructor-arg name="f">
<bean id="shibboleth.ChildLookup.ConsentContext"
class="org.opensaml.messaging.context.navigate.ChildContextLookup"
- c:type="#{ T(net.shibboleth.idp.consent.context.impl.ConsentContext) }" />
+ c:type="#{ T(net.shibboleth.idp.consent.context.ConsentContext) }" />
</constructor-arg>
</bean>
diff --git a/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml b/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
index ac8e623..e2b4be1 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
@@ -121,7 +121,7 @@
result="viewScope.attributeDisplayNameFunction" />
<evaluate expression="new net.shibboleth.idp.consent.logic.impl.AttributeDisplayDescriptionFunction(flowRequestContext.getExternalContext().getNativeRequest(), FallbackLanguages)"
result="viewScope.attributeDisplayDescriptionFunction" />
- <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.consent.context.impl.ConsentContext))" result="viewScope.consentContext" />
+ <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.consent.context.ConsentContext))" result="viewScope.consentContext" />
<evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.consent.context.impl.AttributeReleaseContext))" result="viewScope.attributeReleaseContext" />
<evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext), true).getSubcontext(T(net.shibboleth.idp.ui.context.RelyingPartyUIContext))" result="viewScope.rpUIContext" />
<evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().containsBean('shibboleth.CustomViewContext') ? flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.CustomViewContext') : null" result="viewScope.custom" />
diff --git a/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml b/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml
index 2066a7b..e668802 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml
@@ -27,7 +27,7 @@
<evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="viewScope.response" />
<evaluate expression="T(net.shibboleth.utilities.java.support.codec.HTMLEncoder)" result="viewScope.encoder" />
<evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext), true).getSubcontext(T(net.shibboleth.idp.ui.context.RelyingPartyUIContext))" result="viewScope.rpUIContext" />
- <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.consent.context.impl.ConsentContext)).getCurrentConsents().keySet().iterator().next()" result="viewScope.termsOfUseId" />
+ <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.consent.context.ConsentContext)).getCurrentConsents().keySet().iterator().next()" result="viewScope.termsOfUseId" />
<evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().containsBean('shibboleth.CustomViewContext') ? flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.CustomViewContext') : null" result="viewScope.custom" />
</on-render>
<transition on="TermsRejected" to="AuditTermsRejected" />
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/LoginFlowTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/LoginFlowTest.java
index 6847e0f..e6d0971 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/LoginFlowTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/LoginFlowTest.java
@@ -27,7 +27,7 @@ import net.shibboleth.idp.authn.principal.UsernamePrincipal;
import net.shibboleth.idp.cas.config.impl.LoginConfiguration;
import net.shibboleth.idp.cas.ticket.Ticket;
import net.shibboleth.idp.cas.ticket.TicketService;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/impl/Consent.java b/idp-consent-api/src/main/java/net/shibboleth/idp/consent/Consent.java
similarity index 98%
copy from idp-consent-impl/src/main/java/net/shibboleth/idp/consent/impl/Consent.java
copy to idp-consent-api/src/main/java/net/shibboleth/idp/consent/Consent.java
index aa14058..79873eb 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/impl/Consent.java
+++ b/idp-consent-api/src/main/java/net/shibboleth/idp/consent/Consent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.consent.impl;
+package net.shibboleth.idp.consent;
import java.util.Objects;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/context/impl/ConsentContext.java b/idp-consent-api/src/main/java/net/shibboleth/idp/consent/context/ConsentContext.java
similarity index 96%
copy from idp-consent-impl/src/main/java/net/shibboleth/idp/consent/context/impl/ConsentContext.java
copy to idp-consent-api/src/main/java/net/shibboleth/idp/consent/context/ConsentContext.java
index bb2a6ff..fb64c33 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/context/impl/ConsentContext.java
+++ b/idp-consent-api/src/main/java/net/shibboleth/idp/consent/context/ConsentContext.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package net.shibboleth.idp.consent.context.impl;
+package net.shibboleth.idp.consent.context;
import java.util.LinkedHashMap;
import java.util.Map;
import javax.annotation.Nonnull;
-import net.shibboleth.idp.consent.impl.Consent;
+import net.shibboleth.idp.consent.Consent;
import net.shibboleth.utilities.java.support.annotation.constraint.Live;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/ConsentAuditFields.java b/idp-consent-api/src/main/java/net/shibboleth/idp/consent/package-info.java
similarity index 50%
copy from idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/ConsentAuditFields.java
copy to idp-consent-api/src/main/java/net/shibboleth/idp/consent/package-info.java
index 797867a..23254b8 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/ConsentAuditFields.java
+++ b/idp-consent-api/src/main/java/net/shibboleth/idp/consent/package-info.java
@@ -15,29 +15,8 @@
* limitations under the License.
*/
-package net.shibboleth.idp.consent.audit.impl;
-
-import javax.annotation.Nonnull;
-
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-
/**
- * Constants to use for audit logging fields stored in an {@link net.shibboleth.idp.profile.context.AuditContext} as a
- * child of an {@link net.shibboleth.idp.consent.context.impl.ConsentContext}.
+ * Classed related to consent.
*/
-public final class ConsentAuditFields {
-
- /** Current consents ID field. */
- @Nonnull @NotEmpty public static final String CURRENT_CONSENT_IDS = "CCI";
-
- /** Current consents value field. */
- @Nonnull @NotEmpty public static final String CURRENT_CONSENT_VALUES = "CCV";
-
- /** Current consents isApproved field. */
- @Nonnull @NotEmpty public static final String CURRENT_CONSENT_IS_APPROVED = "CCA";
-
- /** Constructor. */
- private ConsentAuditFields() {
- }
-}
+package net.shibboleth.idp.consent;
\ No newline at end of file
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/ConsentAuditFields.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/ConsentAuditFields.java
index 797867a..1ec9e4f 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/ConsentAuditFields.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/ConsentAuditFields.java
@@ -23,7 +23,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
/**
* Constants to use for audit logging fields stored in an {@link net.shibboleth.idp.profile.context.AuditContext} as a
- * child of an {@link net.shibboleth.idp.consent.context.impl.ConsentContext}.
+ * child of an {@link net.shibboleth.idp.consent.context.ConsentContext}.
*/
public final class ConsentAuditFields {
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentIdsAuditExtractor.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentIdsAuditExtractor.java
index c17bd9d..eb6084e 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentIdsAuditExtractor.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentIdsAuditExtractor.java
@@ -23,7 +23,7 @@ import java.util.Collections;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.utilities.java.support.logic.Constraint;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentIsApprovedAuditExtractor.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentIsApprovedAuditExtractor.java
index 2454088..9e22e18 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentIsApprovedAuditExtractor.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentIsApprovedAuditExtractor.java
@@ -23,8 +23,8 @@ import java.util.Collections;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
-import net.shibboleth.idp.consent.impl.Consent;
+import net.shibboleth.idp.consent.Consent;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.utilities.java.support.logic.Constraint;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentValuesAuditExtractor.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentValuesAuditExtractor.java
index 4c1b8c7..d3c8df7 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentValuesAuditExtractor.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentValuesAuditExtractor.java
@@ -23,8 +23,8 @@ import java.util.Collections;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
-import net.shibboleth.idp.consent.impl.Consent;
+import net.shibboleth.idp.consent.Consent;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.utilities.java.support.logic.Constraint;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/context/impl/ConsentContext.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/context/impl/ConsentContext.java
index bb2a6ff..1584e1f 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/context/impl/ConsentContext.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/context/impl/ConsentContext.java
@@ -17,62 +17,9 @@
package net.shibboleth.idp.consent.context.impl;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-
-import net.shibboleth.idp.consent.impl.Consent;
-import net.shibboleth.utilities.java.support.annotation.constraint.Live;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-
-import org.opensaml.messaging.context.BaseContext;
-
-import com.google.common.base.MoreObjects;
-
/**
* Context representing the state of a consent flow.
- *
- * Holds consent previously given as well as obtained from user input.
+ * @deprecated Use {@link net.shibboleth.idp.consent.context.ConsentContext}
*/
-public class ConsentContext extends BaseContext {
-
- /** Map of previous consent read from storage and keyed by consent id. */
- @Nonnull @NonnullElements @Live private Map<String, Consent> previousConsents;
-
- /** Map of current consent extracted from user input and keyed by consent id. */
- @Nonnull @NonnullElements @Live private Map<String, Consent> currentConsents;
-
- /** Constructor. */
- public ConsentContext() {
- previousConsents = new LinkedHashMap<>();
- currentConsents = new LinkedHashMap<>();
- }
-
- /**
- * Get map of current consent extracted from user input and keyed by consent id.
- *
- * @return map of current consent extracted from user input and keyed by consent id
- */
- @Nonnull @NonnullElements @Live public Map<String, Consent> getCurrentConsents() {
- return currentConsents;
- }
-
- /**
- * Get map of previous consent read from storage and keyed by consent id.
- *
- * @return map of previous consent read from storage and keyed by consent id
- */
- @Nonnull @NonnullElements @Live public Map<String, Consent> getPreviousConsents() {
- return previousConsents;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return MoreObjects.toStringHelper(this)
- .add("previousConsents", previousConsents)
- .add("chosenConsents", currentConsents)
- .toString();
- }
-
-}
+public class ConsentContext extends net.shibboleth.idp.consent.context.ConsentContext
+{}
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/ar/impl/ReleaseAttributes.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/ar/impl/ReleaseAttributes.java
index dd3abfd..ee7d5c9 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/ar/impl/ReleaseAttributes.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/ar/impl/ReleaseAttributes.java
@@ -23,7 +23,7 @@ import java.util.Map;
import javax.annotation.Nonnull;
import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.consent.impl.Consent;
+import net.shibboleth.idp.consent.Consent;
import net.shibboleth.idp.profile.context.ProfileInterceptorContext;
import org.opensaml.profile.context.ProfileRequestContext;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/impl/AbstractConsentAction.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/impl/AbstractConsentAction.java
index b4a285a..f7144e2 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/impl/AbstractConsentAction.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/impl/AbstractConsentAction.java
@@ -20,7 +20,7 @@ package net.shibboleth.idp.consent.flow.impl;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.idp.profile.context.ProfileInterceptorContext;
import net.shibboleth.idp.profile.interceptor.AbstractProfileInterceptorAction;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/impl/ExtractConsent.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/impl/ExtractConsent.java
index 0b6033e..e206dfa 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/impl/ExtractConsent.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/impl/ExtractConsent.java
@@ -24,8 +24,8 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.servlet.http.HttpServletRequest;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
-import net.shibboleth.idp.consent.impl.Consent;
+import net.shibboleth.idp.consent.Consent;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.idp.profile.context.ProfileInterceptorContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/impl/InitializeConsentContext.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/impl/InitializeConsentContext.java
index 8025a74..ef45a7e 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/impl/InitializeConsentContext.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/impl/InitializeConsentContext.java
@@ -19,7 +19,7 @@ package net.shibboleth.idp.consent.flow.impl;
import javax.annotation.Nonnull;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.idp.profile.context.ProfileInterceptorContext;
import net.shibboleth.idp.profile.interceptor.AbstractProfileInterceptorAction;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/impl/PopulateConsentContext.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/impl/PopulateConsentContext.java
index 17280fc..97ebe73 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/impl/PopulateConsentContext.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/impl/PopulateConsentContext.java
@@ -21,7 +21,7 @@ import java.util.Map;
import javax.annotation.Nonnull;
-import net.shibboleth.idp.consent.impl.Consent;
+import net.shibboleth.idp.consent.Consent;
import net.shibboleth.idp.profile.context.ProfileInterceptorContext;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/storage/impl/CreateGlobalConsentResult.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/storage/impl/CreateGlobalConsentResult.java
index 94748af..2193767 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/storage/impl/CreateGlobalConsentResult.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/storage/impl/CreateGlobalConsentResult.java
@@ -22,7 +22,7 @@ import java.util.Collections;
import javax.annotation.Nonnull;
-import net.shibboleth.idp.consent.impl.Consent;
+import net.shibboleth.idp.consent.Consent;
import net.shibboleth.idp.consent.storage.impl.ConsentResult;
import net.shibboleth.idp.profile.context.ProfileInterceptorContext;
import net.shibboleth.idp.profile.interceptor.ProfileInterceptorResult;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/storage/impl/CreateResult.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/storage/impl/CreateResult.java
index 8894b8c..c0652a1 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/storage/impl/CreateResult.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/storage/impl/CreateResult.java
@@ -22,7 +22,7 @@ import java.util.Map;
import javax.annotation.Nonnull;
-import net.shibboleth.idp.consent.impl.Consent;
+import net.shibboleth.idp.consent.Consent;
import net.shibboleth.idp.consent.storage.impl.ConsentResult;
import net.shibboleth.idp.profile.context.ProfileInterceptorContext;
import net.shibboleth.idp.profile.interceptor.ProfileInterceptorResult;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/storage/impl/ReadConsentFromStorage.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/storage/impl/ReadConsentFromStorage.java
index 8441eb6..aa1725d 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/storage/impl/ReadConsentFromStorage.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/storage/impl/ReadConsentFromStorage.java
@@ -22,7 +22,7 @@ import java.util.Map;
import javax.annotation.Nonnull;
-import net.shibboleth.idp.consent.impl.Consent;
+import net.shibboleth.idp.consent.Consent;
import net.shibboleth.idp.profile.context.ProfileInterceptorContext;
import org.opensaml.profile.context.ProfileRequestContext;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/impl/Consent.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/impl/Consent.java
index aa14058..dc7216d 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/impl/Consent.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/impl/Consent.java
@@ -17,103 +17,11 @@
package net.shibboleth.idp.consent.impl;
-import java.util.Objects;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
-import com.google.common.base.MoreObjects;
-
/**
* Represents consent.
*
- * A consent object consists of an identifier, a value (usually a hash) representing the thing being consented to, and a
- * boolean which indicates whether consent is approved or denied.
+ * @deprecated use {@link net.shibboleth.idp.consent.Consent}
*/
-public class Consent extends AbstractIdentifiableInitializableComponent {
-
- /** Wildcard used to represent consent to any ID or value. */
- @Nonnull @NotEmpty public static final String WILDCARD = "*";
-
- /** Consent value. */
- @Nullable private String value;
-
- /** Whether consent is approved. */
- @Nullable private boolean approved;
-
- /**
- * Get the consent value.
- *
- * @return the consent value
- */
- @Nullable public String getValue() {
- return value;
- }
-
- /**
- * Whether consent is approved or denied.
- *
- * @return true if consent is approved
- */
- @Nullable public boolean isApproved() {
- return approved;
- }
-
- /**
- * Set the consent value.
- *
- * @param val the consent value
- */
- public void setValue(@Nonnull @NotEmpty final String val) {
- value = Constraint.isNotNull(StringSupport.trimOrNull(val), "The value cannot be null or empty");
- }
-
- /**
- * Set whether consent is approved.
- *
- * @param flag true if consent is approved
- */
- public void setApproved(final boolean flag) {
- approved = flag;
- }
-
- /** {@inheritDoc} */
- public boolean equals(final Object obj) {
- if (this == obj) {
- return true;
- }
-
- if (obj == null) {
- return false;
- }
-
- if (!(obj instanceof Consent)) {
- return false;
- }
-
- final Consent other = (Consent) obj;
-
- return Objects.equals(getId(), other.getId()) && Objects.equals(getValue(), other.getValue())
- && Objects.equals(isApproved(), other.isApproved());
- }
-
- /** {@inheritDoc} */
- public int hashCode() {
- return Objects.hash(getId(), getValue(), isApproved());
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return MoreObjects.toStringHelper(this)
- .add("id", getId())
- .add("value", getValue())
- .add("isApproved", isApproved())
- .toString();
- }
-
+public class Consent extends net.shibboleth.idp.consent.Consent {
+
}
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AttributeReleaseConsentFunction.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AttributeReleaseConsentFunction.java
index 1e8844c..021a145 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AttributeReleaseConsentFunction.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AttributeReleaseConsentFunction.java
@@ -27,10 +27,10 @@ import javax.annotation.Nullable;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
+import net.shibboleth.idp.consent.Consent;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.idp.consent.context.impl.AttributeReleaseContext;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
import net.shibboleth.idp.consent.flow.impl.ConsentFlowDescriptor;
-import net.shibboleth.idp.consent.impl.Consent;
import net.shibboleth.utilities.java.support.logic.Constraint;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/GlobalAttributeConsentPredicate.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/GlobalAttributeConsentPredicate.java
index 982a238..d3af783 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/GlobalAttributeConsentPredicate.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/GlobalAttributeConsentPredicate.java
@@ -22,8 +22,8 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
-import net.shibboleth.idp.consent.impl.Consent;
+import net.shibboleth.idp.consent.Consent;
+import net.shibboleth.idp.consent.context.ConsentContext;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.context.ProfileRequestContext;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/IsConsentRequiredPredicate.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/IsConsentRequiredPredicate.java
index ac76f4f..0064719 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/IsConsentRequiredPredicate.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/IsConsentRequiredPredicate.java
@@ -23,9 +23,9 @@ import java.util.Objects;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
+import net.shibboleth.idp.consent.Consent;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.idp.consent.flow.impl.ConsentFlowDescriptor;
-import net.shibboleth.idp.consent.impl.Consent;
import net.shibboleth.utilities.java.support.logic.Constraint;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/MessageSourceConsentFunction.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/MessageSourceConsentFunction.java
index 4fbae6c..0a7227c 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/MessageSourceConsentFunction.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/MessageSourceConsentFunction.java
@@ -24,8 +24,8 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import net.shibboleth.idp.consent.Consent;
import net.shibboleth.idp.consent.flow.impl.ConsentFlowDescriptor;
-import net.shibboleth.idp.consent.impl.Consent;
import net.shibboleth.idp.profile.context.navigate.RelyingPartyIdLookupFunction;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/storage/impl/ConsentSerializer.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/storage/impl/ConsentSerializer.java
index f76a714..2d11035 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/storage/impl/ConsentSerializer.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/storage/impl/ConsentSerializer.java
@@ -40,7 +40,7 @@ import javax.json.spi.JsonProvider;
import javax.json.stream.JsonGenerator;
import javax.json.stream.JsonGeneratorFactory;
-import net.shibboleth.idp.consent.impl.Consent;
+import net.shibboleth.idp.consent.Consent;
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.AbstractInitializableComponent;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/audit/impl/AbstractConsentAuditExtractorTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/audit/impl/AbstractConsentAuditExtractorTest.java
index 4b325cf..e8622c6 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/audit/impl/AbstractConsentAuditExtractorTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/audit/impl/AbstractConsentAuditExtractorTest.java
@@ -17,7 +17,7 @@
package net.shibboleth.idp.consent.audit.impl;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.idp.consent.impl.ConsentTestingSupport;
import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentIdsAuditExtractorTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentIdsAuditExtractorTest.java
index fa4a8d8..14788f8 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentIdsAuditExtractorTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentIdsAuditExtractorTest.java
@@ -19,14 +19,14 @@ package net.shibboleth.idp.consent.audit.impl;
import java.util.Collections;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
-
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
+import net.shibboleth.idp.consent.context.ConsentContext;
+
/** {@link CurrentConsentIdsAuditExtractor} unit test. */
public class CurrentConsentIdsAuditExtractorTest extends AbstractConsentAuditExtractorTest {
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentIsApprovedAuditExtractorTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentIsApprovedAuditExtractorTest.java
index e954749..81ad738 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentIsApprovedAuditExtractorTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentIsApprovedAuditExtractorTest.java
@@ -19,14 +19,14 @@ package net.shibboleth.idp.consent.audit.impl;
import java.util.Collections;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
-
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
+import net.shibboleth.idp.consent.context.ConsentContext;
+
/** {@link CurrentConsentIsApprovedAuditExtractor} unit test. */
public class CurrentConsentIsApprovedAuditExtractorTest extends AbstractConsentAuditExtractorTest {
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentValuesAuditExtractorTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentValuesAuditExtractorTest.java
index 1a99aac..0e603ba 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentValuesAuditExtractorTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/audit/impl/CurrentConsentValuesAuditExtractorTest.java
@@ -19,14 +19,14 @@ package net.shibboleth.idp.consent.audit.impl;
import java.util.Collections;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
-
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
+import net.shibboleth.idp.consent.context.ConsentContext;
+
/** {@link CurrentConsentValuesAuditExtractor} unit test. */
public class CurrentConsentValuesAuditExtractorTest extends AbstractConsentAuditExtractorTest {
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/context/impl/ConsentContextTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/context/impl/ConsentContextTest.java
index 12438cc..ecba0d7 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/context/impl/ConsentContextTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/context/impl/ConsentContextTest.java
@@ -19,7 +19,8 @@ package net.shibboleth.idp.consent.context.impl;
import java.util.Map;
-import net.shibboleth.idp.consent.impl.Consent;
+import net.shibboleth.idp.consent.Consent;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.idp.consent.impl.ConsentTestingSupport;
import org.testng.Assert;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/ar/impl/ReleaseAttributesTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/ar/impl/ReleaseAttributesTest.java
index 992af7d..8ed0043 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/ar/impl/ReleaseAttributesTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/ar/impl/ReleaseAttributesTest.java
@@ -22,9 +22,9 @@ import java.util.Map;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.context.AttributeContext;
+import net.shibboleth.idp.consent.Consent;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.idp.consent.context.impl.AttributeReleaseContext;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
-import net.shibboleth.idp.consent.impl.Consent;
import net.shibboleth.idp.consent.impl.ConsentTestingSupport;
import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/AbstractConsentActionTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/AbstractConsentActionTest.java
index 92170b9..2f28c49 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/AbstractConsentActionTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/AbstractConsentActionTest.java
@@ -17,7 +17,7 @@
package net.shibboleth.idp.consent.flow.impl;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.ProfileInterceptorContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/ExtractConsentTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/ExtractConsentTest.java
index b569521..a9b9b8e 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/ExtractConsentTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/ExtractConsentTest.java
@@ -17,8 +17,8 @@
package net.shibboleth.idp.consent.flow.impl;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
-import net.shibboleth.idp.consent.impl.Consent;
+import net.shibboleth.idp.consent.Consent;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.idp.consent.impl.ConsentTestingSupport;
import net.shibboleth.idp.profile.ActionTestingSupport;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/InitializeConsentContextTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/InitializeConsentContextTest.java
index 7a7bd3c..d2f2900 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/InitializeConsentContextTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/InitializeConsentContextTest.java
@@ -17,7 +17,7 @@
package net.shibboleth.idp.consent.flow.impl;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/PopulateConsentContextTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/PopulateConsentContextTest.java
index bddc926..ffacef0 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/PopulateConsentContextTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/PopulateConsentContextTest.java
@@ -21,8 +21,8 @@ import java.util.Map;
import javax.annotation.Nonnull;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
-import net.shibboleth.idp.consent.impl.Consent;
+import net.shibboleth.idp.consent.Consent;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.idp.consent.impl.ConsentTestingSupport;
import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/storage/impl/AbstractConsentStorageActionTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/storage/impl/AbstractConsentStorageActionTest.java
index db641eb..9a53bab 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/storage/impl/AbstractConsentStorageActionTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/storage/impl/AbstractConsentStorageActionTest.java
@@ -20,8 +20,8 @@ package net.shibboleth.idp.consent.flow.storage.impl;
import java.io.IOException;
import java.util.Map;
+import net.shibboleth.idp.consent.Consent;
import net.shibboleth.idp.consent.flow.impl.AbstractConsentActionTest;
-import net.shibboleth.idp.consent.impl.Consent;
import net.shibboleth.idp.consent.storage.impl.ConsentSerializer;
import net.shibboleth.idp.profile.context.ProfileInterceptorContext;
import net.shibboleth.utilities.java.support.component.UnmodifiableComponentException;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/storage/impl/CreateGlobalConsentResultTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/storage/impl/CreateGlobalConsentResultTest.java
index 6e618f8..5075ccd 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/storage/impl/CreateGlobalConsentResultTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/storage/impl/CreateGlobalConsentResultTest.java
@@ -21,7 +21,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Map;
-import net.shibboleth.idp.consent.impl.Consent;
+import net.shibboleth.idp.consent.Consent;
import net.shibboleth.idp.profile.ActionTestingSupport;
import net.shibboleth.idp.profile.context.ProfileInterceptorContext;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/storage/impl/CreateResultTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/storage/impl/CreateResultTest.java
index 9709d39..57b58d9 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/storage/impl/CreateResultTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/storage/impl/CreateResultTest.java
@@ -25,8 +25,8 @@ import java.util.Map;
import javax.annotation.Nonnull;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
-import net.shibboleth.idp.consent.impl.Consent;
+import net.shibboleth.idp.consent.Consent;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.idp.consent.impl.ConsentTestingSupport;
import net.shibboleth.idp.consent.storage.impl.ConsentSerializer;
import net.shibboleth.idp.profile.ActionTestingSupport;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/storage/impl/ReadConsentFromStorageTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/storage/impl/ReadConsentFromStorageTest.java
index 9705c0b..f028a52 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/storage/impl/ReadConsentFromStorageTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/storage/impl/ReadConsentFromStorageTest.java
@@ -17,7 +17,7 @@
package net.shibboleth.idp.consent.flow.storage.impl;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.idp.consent.impl.ConsentTestingSupport;
import net.shibboleth.idp.profile.ActionTestingSupport;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/impl/ConsentTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/impl/ConsentTest.java
index d8094b0..c8df655 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/impl/ConsentTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/impl/ConsentTest.java
@@ -17,6 +17,7 @@
package net.shibboleth.idp.consent.impl;
+import net.shibboleth.idp.consent.Consent;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import org.testng.Assert;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/impl/ConsentTestingSupport.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/impl/ConsentTestingSupport.java
index eb8700e..bf744f2 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/impl/ConsentTestingSupport.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/impl/ConsentTestingSupport.java
@@ -27,6 +27,7 @@ import java.util.Map;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
+import net.shibboleth.idp.consent.Consent;
import net.shibboleth.idp.consent.storage.impl.ConsentResult;
/**
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/AttributeReleaseConsentFunctionTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/AttributeReleaseConsentFunctionTest.java
index 817020f..03eb174 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/AttributeReleaseConsentFunctionTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/AttributeReleaseConsentFunctionTest.java
@@ -21,10 +21,10 @@ import java.util.HashMap;
import java.util.Map;
import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.idp.consent.Consent;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.idp.consent.context.impl.AttributeReleaseContext;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
import net.shibboleth.idp.consent.flow.impl.ConsentFlowDescriptor;
-import net.shibboleth.idp.consent.impl.Consent;
import net.shibboleth.idp.consent.impl.ConsentTestingSupport;
import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.ProfileInterceptorContext;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/GlobalAttributeConsentPredicateTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/GlobalAttributeConsentPredicateTest.java
index d4fbc40..3c1df34 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/GlobalAttributeConsentPredicateTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/GlobalAttributeConsentPredicateTest.java
@@ -17,8 +17,8 @@
package net.shibboleth.idp.consent.logic.impl;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
-import net.shibboleth.idp.consent.impl.Consent;
+import net.shibboleth.idp.consent.Consent;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.idp.consent.impl.ConsentTestingSupport;
import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/IsConsentRequiredPredicateTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/IsConsentRequiredPredicateTest.java
index 380ffa6..d62be18 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/IsConsentRequiredPredicateTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/IsConsentRequiredPredicateTest.java
@@ -20,9 +20,9 @@ package net.shibboleth.idp.consent.logic.impl;
import java.util.Map;
import java.util.Objects;
-import net.shibboleth.idp.consent.context.impl.ConsentContext;
+import net.shibboleth.idp.consent.Consent;
+import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.idp.consent.flow.impl.ConsentFlowDescriptor;
-import net.shibboleth.idp.consent.impl.Consent;
import net.shibboleth.idp.consent.impl.ConsentTestingSupport;
import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.ProfileInterceptorContext;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/MessageSourceConsentFunctionTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/MessageSourceConsentFunctionTest.java
index 680a036..54390ef 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/MessageSourceConsentFunctionTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/MessageSourceConsentFunctionTest.java
@@ -21,8 +21,8 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
+import net.shibboleth.idp.consent.Consent;
import net.shibboleth.idp.consent.flow.impl.ConsentFlowDescriptor;
-import net.shibboleth.idp.consent.impl.Consent;
import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.profile.context.ProfileInterceptorContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/storage/impl/ConsentSerializerTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/storage/impl/ConsentSerializerTest.java
index 46e55ac..6bdaac7 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/storage/impl/ConsentSerializerTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/storage/impl/ConsentSerializerTest.java
@@ -26,7 +26,7 @@ import javax.annotation.Nonnull;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.IdPAttributeValue;
-import net.shibboleth.idp.consent.impl.Consent;
+import net.shibboleth.idp.consent.Consent;
import net.shibboleth.idp.consent.impl.ConsentTestingSupport;
import net.shibboleth.idp.consent.logic.impl.AttributeValuesHashFunction;
import net.shibboleth.utilities.java.support.component.UnmodifiableComponentException;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list