[java-identity-provider] branch master updated: Remove an unneeded ProfileRequestContext dependency.
Scott Cantor
cantor.2 at osu.edu
Mon Sep 24 11:16:42 EDT 2018
This is an automated email from the git hooks/post-receive script.
scantor 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=476151cfc7d190a5af542a91efba36ebbcf37f43
The following commit(s) were added to refs/heads/master by this push:
new 476151c Remove an unneeded ProfileRequestContext dependency.
476151c is described below
commit 476151cfc7d190a5af542a91efba36ebbcf37f43
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 24 11:14:58 2018 -0400
Remove an unneeded ProfileRequestContext dependency.
---
.../AbstractMetadataDrivenConfigurationLookupStrategy.java | 14 +++++---------
.../profile/config/BeanConfigurationLookupStrategy.java | 4 +---
.../profile/config/BooleanConfigurationLookupStrategy.java | 4 +---
.../profile/config/DoubleConfigurationLookupStrategy.java | 4 +---
.../config/DurationConfigurationLookupStrategy.java | 4 +---
.../profile/config/IntegerConfigurationLookupStrategy.java | 4 +---
.../profile/config/ListConfigurationLookupStrategy.java | 4 +---
.../profile/config/LongConfigurationLookupStrategy.java | 4 +---
.../profile/config/SetConfigurationLookupStrategy.java | 4 +---
.../profile/config/StringConfigurationLookupStrategy.java | 4 +---
10 files changed, 14 insertions(+), 36 deletions(-)
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractMetadataDrivenConfigurationLookupStrategy.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractMetadataDrivenConfigurationLookupStrategy.java
index ee5493c..dd669ce 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractMetadataDrivenConfigurationLookupStrategy.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractMetadataDrivenConfigurationLookupStrategy.java
@@ -201,7 +201,7 @@ public abstract class AbstractMetadataDrivenConfigurationLookupStrategy<T> exten
Attribute attribute = findMatchingTag(entity, input.getProfileId() + '/' + propertyName);
if (attribute != null) {
log.debug("Found matching tag '{}' for property '{}'", attribute.getName(), propertyName);
- final T result = translate(input, attribute);
+ final T result = translate(attribute);
if (enableCaching) {
cacheContext.getPropertyMap().put(propertyName, result);
}
@@ -212,7 +212,7 @@ public abstract class AbstractMetadataDrivenConfigurationLookupStrategy<T> exten
attribute = findMatchingTag(entity, alias);
if (attribute != null) {
log.debug("Found matching tag '{}' for property '{}'", attribute.getName(), propertyName);
- final T result = translate(input, attribute);
+ final T result = translate(attribute);
if (enableCaching) {
cacheContext.getPropertyMap().put(propertyName, result);
}
@@ -230,13 +230,11 @@ public abstract class AbstractMetadataDrivenConfigurationLookupStrategy<T> exten
/**
* Translate the value(s) into a setting of the appropriate type.
*
- * @param profileRequestContext current profile request context
* @param tag tag to translate
*
* @return the setting derived from the tag's value(s)
*/
- @Nullable private T translate(@Nullable final ProfileRequestContext profileRequestContext,
- @Nonnull final Attribute tag) {
+ @Nullable private T translate(@Nonnull final Attribute tag) {
final List<XMLObject> values = tag.getAttributeValues();
if (values == null || values.isEmpty()) {
@@ -244,7 +242,7 @@ public abstract class AbstractMetadataDrivenConfigurationLookupStrategy<T> exten
return null;
}
- return doTranslate(profileRequestContext, tag);
+ return doTranslate(tag);
}
/**
@@ -252,13 +250,11 @@ public abstract class AbstractMetadataDrivenConfigurationLookupStrategy<T> exten
*
* <p>Overrides of this function can assume a non-zero collection of values.</p>
*
- * @param profileRequestContext current profile request context
* @param tag tag to translate
*
* @return the setting derived from the tag's value(s)
*/
- @Nullable protected abstract T doTranslate(@Nullable final ProfileRequestContext profileRequestContext,
- @Nonnull final Attribute tag);
+ @Nullable protected abstract T doTranslate(@Nonnull final Attribute tag);
/**
* Find a matching entity attribute in the input metadata.
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/BeanConfigurationLookupStrategy.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/BeanConfigurationLookupStrategy.java
index f2bb6cb..65248e8 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/BeanConfigurationLookupStrategy.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/BeanConfigurationLookupStrategy.java
@@ -25,7 +25,6 @@ import javax.annotation.Nullable;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.schema.XSAny;
import org.opensaml.core.xml.schema.XSString;
-import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.saml.saml2.core.Attribute;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -95,8 +94,7 @@ public class BeanConfigurationLookupStrategy<T> extends AbstractMetadataDrivenCo
/** {@inheritDoc} */
@Override
- @Nullable protected T doTranslate(@Nullable final ProfileRequestContext profileRequestContext,
- @Nonnull final Attribute tag) {
+ @Nullable protected T doTranslate(@Nonnull final Attribute tag) {
final List<XMLObject> values = tag.getAttributeValues();
if (values.size() != 1) {
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/BooleanConfigurationLookupStrategy.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/BooleanConfigurationLookupStrategy.java
index 2c3420d..cbab637 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/BooleanConfigurationLookupStrategy.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/BooleanConfigurationLookupStrategy.java
@@ -28,7 +28,6 @@ import org.opensaml.core.xml.schema.XSBoolean;
import org.opensaml.core.xml.schema.XSBooleanValue;
import org.opensaml.core.xml.schema.XSInteger;
import org.opensaml.core.xml.schema.XSString;
-import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.saml.saml2.core.Attribute;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,8 +45,7 @@ public class BooleanConfigurationLookupStrategy extends AbstractMetadataDrivenCo
/** {@inheritDoc} */
@Override
- @Nullable protected Boolean doTranslate(@Nullable final ProfileRequestContext profileRequestContext,
- @Nonnull final Attribute tag) {
+ @Nullable protected Boolean doTranslate(@Nonnull final Attribute tag) {
final List<XMLObject> values = tag.getAttributeValues();
if (values.size() != 1) {
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/DoubleConfigurationLookupStrategy.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/DoubleConfigurationLookupStrategy.java
index 640aa38..4a3caa2 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/DoubleConfigurationLookupStrategy.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/DoubleConfigurationLookupStrategy.java
@@ -28,7 +28,6 @@ import org.opensaml.core.xml.schema.XSBoolean;
import org.opensaml.core.xml.schema.XSBooleanValue;
import org.opensaml.core.xml.schema.XSInteger;
import org.opensaml.core.xml.schema.XSString;
-import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.saml.saml2.core.Attribute;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,8 +45,7 @@ public class DoubleConfigurationLookupStrategy extends AbstractMetadataDrivenCon
/** {@inheritDoc} */
@Override
- @Nullable protected Double doTranslate(@Nullable final ProfileRequestContext profileRequestContext,
- @Nonnull final Attribute tag) {
+ @Nullable protected Double doTranslate(@Nonnull final Attribute tag) {
final List<XMLObject> values = tag.getAttributeValues();
if (values.size() != 1) {
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/DurationConfigurationLookupStrategy.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/DurationConfigurationLookupStrategy.java
index cc954e4..a8f2f08 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/DurationConfigurationLookupStrategy.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/DurationConfigurationLookupStrategy.java
@@ -26,7 +26,6 @@ import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.schema.XSAny;
import org.opensaml.core.xml.schema.XSInteger;
import org.opensaml.core.xml.schema.XSString;
-import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.saml.saml2.core.Attribute;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,8 +53,7 @@ public class DurationConfigurationLookupStrategy extends AbstractMetadataDrivenC
/** {@inheritDoc} */
@Override
- @Nullable protected Long doTranslate(@Nullable final ProfileRequestContext profileRequestContext,
- @Nonnull final Attribute tag) {
+ @Nullable protected Long doTranslate(@Nonnull final Attribute tag) {
final List<XMLObject> values = tag.getAttributeValues();
if (values.size() != 1) {
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/IntegerConfigurationLookupStrategy.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/IntegerConfigurationLookupStrategy.java
index de0fe07..8d60963 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/IntegerConfigurationLookupStrategy.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/IntegerConfigurationLookupStrategy.java
@@ -28,7 +28,6 @@ import org.opensaml.core.xml.schema.XSBoolean;
import org.opensaml.core.xml.schema.XSBooleanValue;
import org.opensaml.core.xml.schema.XSInteger;
import org.opensaml.core.xml.schema.XSString;
-import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.saml.saml2.core.Attribute;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,8 +45,7 @@ public class IntegerConfigurationLookupStrategy extends AbstractMetadataDrivenCo
/** {@inheritDoc} */
@Override
- @Nullable protected Integer doTranslate(@Nullable final ProfileRequestContext profileRequestContext,
- @Nonnull final Attribute tag) {
+ @Nullable protected Integer doTranslate(@Nonnull final Attribute tag) {
final List<XMLObject> values = tag.getAttributeValues();
if (values.size() != 1) {
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/ListConfigurationLookupStrategy.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/ListConfigurationLookupStrategy.java
index 86d8238..c54797e 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/ListConfigurationLookupStrategy.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/ListConfigurationLookupStrategy.java
@@ -24,7 +24,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.saml.saml2.core.Attribute;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,8 +43,7 @@ public class ListConfigurationLookupStrategy<T> extends AbstractCollectionConfig
/** {@inheritDoc} */
@Override
- @Nullable protected List<T> doTranslate(@Nullable final ProfileRequestContext profileRequestContext,
- @Nonnull final Attribute tag) {
+ @Nullable protected List<T> doTranslate(@Nonnull final Attribute tag) {
log.debug("Converting tag '{}' to List<{}> property", tag.getName(), getPropertyType().getSimpleName());
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/LongConfigurationLookupStrategy.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/LongConfigurationLookupStrategy.java
index 64fa254..dec5c67 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/LongConfigurationLookupStrategy.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/LongConfigurationLookupStrategy.java
@@ -30,7 +30,6 @@ import org.opensaml.core.xml.schema.XSBooleanValue;
import org.opensaml.core.xml.schema.XSDateTime;
import org.opensaml.core.xml.schema.XSInteger;
import org.opensaml.core.xml.schema.XSString;
-import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.saml.saml2.core.Attribute;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,8 +47,7 @@ public class LongConfigurationLookupStrategy extends AbstractMetadataDrivenConfi
/** {@inheritDoc} */
@Override
- @Nullable protected Long doTranslate(@Nullable final ProfileRequestContext profileRequestContext,
- @Nonnull final Attribute tag) {
+ @Nullable protected Long doTranslate(@Nonnull final Attribute tag) {
final List<XMLObject> values = tag.getAttributeValues();
if (values.size() != 1) {
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SetConfigurationLookupStrategy.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SetConfigurationLookupStrategy.java
index a74ddb4..925bcf5 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SetConfigurationLookupStrategy.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SetConfigurationLookupStrategy.java
@@ -25,7 +25,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opensaml.core.xml.XMLObject;
-import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.saml.saml2.core.Attribute;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,8 +44,7 @@ public class SetConfigurationLookupStrategy<T> extends AbstractCollectionConfigu
/** {@inheritDoc} */
@Override
- @Nullable protected Set<T> doTranslate(@Nullable final ProfileRequestContext profileRequestContext,
- @Nonnull final Attribute tag) {
+ @Nullable protected Set<T> doTranslate(@Nonnull final Attribute tag) {
log.debug("Converting tag '{}' to Set<String> property", tag.getName());
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/StringConfigurationLookupStrategy.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/StringConfigurationLookupStrategy.java
index 714722c..459d2d9 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/StringConfigurationLookupStrategy.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/StringConfigurationLookupStrategy.java
@@ -32,7 +32,6 @@ import org.opensaml.core.xml.schema.XSDateTime;
import org.opensaml.core.xml.schema.XSInteger;
import org.opensaml.core.xml.schema.XSString;
import org.opensaml.core.xml.schema.XSURI;
-import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.saml.saml2.core.Attribute;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,8 +49,7 @@ public class StringConfigurationLookupStrategy extends AbstractMetadataDrivenCon
/** {@inheritDoc} */
@Override
- @Nullable protected String doTranslate(@Nullable final ProfileRequestContext profileRequestContext,
- @Nonnull final Attribute tag) {
+ @Nullable protected String doTranslate(@Nonnull final Attribute tag) {
final List<XMLObject> values = tag.getAttributeValues();
if (values.size() != 1) {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list