[java-identity-provider] 02/02: IDP-1213 Move AttributeReleaseContext class to api
Rod Widdowson
rdw at steadingsoftware.com
Sat Jun 30 10:09:58 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=1d229f8532518effb927e7806f0d7718e141107f
commit 1d229f8532518effb927e7806f0d7718e141107f
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jun 29 16:47:00 2018 +0100
IDP-1213 Move AttributeReleaseContext class to api
https://issues.shibboleth.net/jira/browse/IDP-1213
---
.../flows/intercept/attribute-release-flow.xml | 2 +-
idp-consent-api/pom.xml | 5 +++
.../consent/context}/AttributeReleaseContext.java | 2 +-
.../context/impl/AttributeReleaseContext.java | 44 ++--------------------
.../ar/impl/AbstractAttributeReleaseAction.java | 2 +-
.../ar/impl/InitializeAttributeReleaseContext.java | 2 +-
.../impl/AttributeReleaseConsentFunction.java | 2 +-
.../context/impl/AttributeReleaseContextTest.java | 1 +
.../impl/AbstractAttributeReleaseActionTest.java | 2 +-
.../InitializeAttributeReleaseContextTest.java | 2 +-
.../impl/PopulateAttributeReleaseContextTest.java | 2 +-
.../flow/ar/impl/ReleaseAttributesTest.java | 2 +-
.../impl/AttributeReleaseConsentFunctionTest.java | 2 +-
13 files changed, 19 insertions(+), 51 deletions(-)
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 e2b4be1..800c26b 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
@@ -122,7 +122,7 @@
<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.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.consent.context.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" />
</on-render>
diff --git a/idp-consent-api/pom.xml b/idp-consent-api/pom.xml
index 294da71..5b5e973 100644
--- a/idp-consent-api/pom.xml
+++ b/idp-consent-api/pom.xml
@@ -18,6 +18,11 @@
<dependencies>
<!-- Compile Dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-attribute-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- Provided Dependencies -->
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/context/impl/AttributeReleaseContext.java b/idp-consent-api/src/main/java/net/shibboleth/idp/consent/context/AttributeReleaseContext.java
similarity index 97%
copy from idp-consent-impl/src/main/java/net/shibboleth/idp/consent/context/impl/AttributeReleaseContext.java
copy to idp-consent-api/src/main/java/net/shibboleth/idp/consent/context/AttributeReleaseContext.java
index 2f0366a..cf92c46 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/context/impl/AttributeReleaseContext.java
+++ b/idp-consent-api/src/main/java/net/shibboleth/idp/consent/context/AttributeReleaseContext.java
@@ -15,7 +15,7 @@
* 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;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/context/impl/AttributeReleaseContext.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/context/impl/AttributeReleaseContext.java
index 2f0366a..2d1ea0f 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/context/impl/AttributeReleaseContext.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/context/impl/AttributeReleaseContext.java
@@ -17,47 +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.attribute.IdPAttribute;
-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 for attribute release consent.
- *
- * Holds the attributes for which consent is obtained.
+ * @deprecated Use {@link net.shibboleth.idp.consent.context.AttributeReleaseContext}
*/
-public class AttributeReleaseContext extends BaseContext {
-
- /** Attributes to be consented to. */
- @Nonnull @NonnullElements @Live private Map<String, IdPAttribute> consentableAttributes;
-
- /** Constructor. */
- public AttributeReleaseContext() {
- consentableAttributes = new LinkedHashMap<>();
- }
-
- /**
- * Get the attributes to be consented to.
- *
- * @return the attributes to be consented to
- */
- @Nonnull @NonnullElements @Live public Map<String, IdPAttribute> getConsentableAttributes() {
- return consentableAttributes;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return MoreObjects.toStringHelper(this)
- .add("consentableAttributes", consentableAttributes)
- .toString();
- }
-}
+public class AttributeReleaseContext extends net.shibboleth.idp.consent.context.AttributeReleaseContext
+{}
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/ar/impl/AbstractAttributeReleaseAction.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/ar/impl/AbstractAttributeReleaseAction.java
index 5e3ef9c..02f25ae 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/ar/impl/AbstractAttributeReleaseAction.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/ar/impl/AbstractAttributeReleaseAction.java
@@ -21,7 +21,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.shibboleth.idp.attribute.context.AttributeContext;
-import net.shibboleth.idp.consent.context.impl.AttributeReleaseContext;
+import net.shibboleth.idp.consent.context.AttributeReleaseContext;
import net.shibboleth.idp.consent.flow.impl.AbstractConsentAction;
import net.shibboleth.idp.profile.IdPEventIds;
import net.shibboleth.idp.profile.context.ProfileInterceptorContext;
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/ar/impl/InitializeAttributeReleaseContext.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/ar/impl/InitializeAttributeReleaseContext.java
index a994f8e..7bc4dd7 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/ar/impl/InitializeAttributeReleaseContext.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/flow/ar/impl/InitializeAttributeReleaseContext.java
@@ -19,7 +19,7 @@ package net.shibboleth.idp.consent.flow.ar.impl;
import javax.annotation.Nonnull;
-import net.shibboleth.idp.consent.context.impl.AttributeReleaseContext;
+import net.shibboleth.idp.consent.context.AttributeReleaseContext;
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/logic/impl/AttributeReleaseConsentFunction.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AttributeReleaseConsentFunction.java
index 021a145..f154473 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
@@ -28,8 +28,8 @@ 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.AttributeReleaseContext;
import net.shibboleth.idp.consent.context.ConsentContext;
-import net.shibboleth.idp.consent.context.impl.AttributeReleaseContext;
import net.shibboleth.idp.consent.flow.impl.ConsentFlowDescriptor;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/context/impl/AttributeReleaseContextTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/context/impl/AttributeReleaseContextTest.java
index a5c0f5e..1fe8311 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/context/impl/AttributeReleaseContextTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/context/impl/AttributeReleaseContextTest.java
@@ -23,6 +23,7 @@ import java.util.Map;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.StringAttributeValue;
+import net.shibboleth.idp.consent.context.AttributeReleaseContext;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/ar/impl/AbstractAttributeReleaseActionTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/ar/impl/AbstractAttributeReleaseActionTest.java
index dd41cf1..101d64b 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/ar/impl/AbstractAttributeReleaseActionTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/ar/impl/AbstractAttributeReleaseActionTest.java
@@ -18,7 +18,7 @@
package net.shibboleth.idp.consent.flow.ar.impl;
import net.shibboleth.idp.attribute.context.AttributeContext;
-import net.shibboleth.idp.consent.context.impl.AttributeReleaseContext;
+import net.shibboleth.idp.consent.context.AttributeReleaseContext;
import net.shibboleth.idp.consent.flow.impl.AbstractConsentActionTest;
import net.shibboleth.idp.consent.impl.ConsentTestingSupport;
import net.shibboleth.idp.profile.context.ProfileInterceptorContext;
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/ar/impl/InitializeAttributeReleaseContextTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/ar/impl/InitializeAttributeReleaseContextTest.java
index 6ff3962..2f3cce5 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/ar/impl/InitializeAttributeReleaseContextTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/ar/impl/InitializeAttributeReleaseContextTest.java
@@ -17,7 +17,7 @@
package net.shibboleth.idp.consent.flow.ar.impl;
-import net.shibboleth.idp.consent.context.impl.AttributeReleaseContext;
+import net.shibboleth.idp.consent.context.AttributeReleaseContext;
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/ar/impl/PopulateAttributeReleaseContextTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/ar/impl/PopulateAttributeReleaseContextTest.java
index b295336..95ab128 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/ar/impl/PopulateAttributeReleaseContextTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/ar/impl/PopulateAttributeReleaseContextTest.java
@@ -30,7 +30,7 @@ import javax.annotation.Nullable;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.context.AttributeContext;
-import net.shibboleth.idp.consent.context.impl.AttributeReleaseContext;
+import net.shibboleth.idp.consent.context.AttributeReleaseContext;
import net.shibboleth.idp.consent.impl.ConsentTestingSupport;
import net.shibboleth.idp.consent.logic.impl.PreferExplicitOrderComparator;
import net.shibboleth.idp.profile.ActionTestingSupport;
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 8ed0043..34cd49a 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
@@ -23,8 +23,8 @@ 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.AttributeReleaseContext;
import net.shibboleth.idp.consent.context.ConsentContext;
-import net.shibboleth.idp.consent.context.impl.AttributeReleaseContext;
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/logic/impl/AttributeReleaseConsentFunctionTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/AttributeReleaseConsentFunctionTest.java
index 03eb174..7e4c876 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
@@ -22,8 +22,8 @@ import java.util.Map;
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.consent.Consent;
+import net.shibboleth.idp.consent.context.AttributeReleaseContext;
import net.shibboleth.idp.consent.context.ConsentContext;
-import net.shibboleth.idp.consent.context.impl.AttributeReleaseContext;
import net.shibboleth.idp.consent.flow.impl.ConsentFlowDescriptor;
import net.shibboleth.idp.consent.impl.ConsentTestingSupport;
import net.shibboleth.idp.profile.RequestContextBuilder;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list