[java-identity-provider] branch master updated: Remove mostly never used from helper function.
Rod Widdowson
rdw at steadingsoftware.com
Thu Nov 22 05:33:19 EST 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=359c4f1dbb6d2cc1773350ea1fa2fe6f66f2b3db
The following commit(s) were added to refs/heads/master by this push:
new 359c4f1 Remove mostly never used from helper function.
359c4f1 is described below
commit 359c4f1dbb6d2cc1773350ea1fa2fe6f66f2b3db
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Nov 22 10:27:58 2018 +0000
Remove mostly never used from helper function.
We use PrincipalConnectors in exactly one place. So only provide them there.
Will make the deprecation removal work far more obvious as to purpose
---
.../resolver/ad/impl/PrescopedAtributeTest.java | 6 +-
.../resolver/ad/impl/RegexAtributeTest.java | 4 +-
...SAML1NameIdentifierAttributeDefinitionTest.java | 10 +--
.../impl/SAML2NameIDAttributeDefinitionTest.java | 8 +--
.../resolver/ad/impl/ScopedAttributeTest.java | 2 +-
.../resolver/ad/impl/ScriptedAttributeTest.java | 10 +--
.../resolver/ad/impl/SimpleAttributeTest.java | 6 +-
.../resolver/ad/impl/TemplateAttributeTest.java | 12 ++--
.../dc/impl/ComputedIDDataConnectorTest.java | 8 +--
.../resolver/impl/AttributeResolverImplTest.java | 79 ++++++++++++----------
.../idp/profile/impl/ResolveAttributesTest.java | 6 +-
11 files changed, 79 insertions(+), 72 deletions(-)
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java
index c4c6802..746e878 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java
@@ -84,7 +84,7 @@ public class PrescopedAtributeTest {
final Set<AttributeDefinition> attributeSet = new LazySet<>();
attributeSet.add(attrDef);
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attributeSet, connectorSet, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attributeSet, connectorSet);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -122,7 +122,7 @@ public class PrescopedAtributeTest {
final Set<AttributeDefinition> attributeSet = new LazySet<>();
attributeSet.add(attrDef);
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attributeSet, connectorSet, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attributeSet, connectorSet);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -208,7 +208,7 @@ public class PrescopedAtributeTest {
final Set<AttributeDefinition> attributeSet = new LazySet<>();
attributeSet.add(attrDef);
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attributeSet, connectorSet, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attributeSet, connectorSet);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java
index 1071829..6e5d17b 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java
@@ -84,7 +84,7 @@ public class RegexAtributeTest {
final Set<AttributeDefinition> attributeSet = new LazySet<>();
attributeSet.add(attrDef);
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attributeSet, connectorSet, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attributeSet, connectorSet);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -169,7 +169,7 @@ public class RegexAtributeTest {
final Set<AttributeDefinition> attributeSet = new LazySet<>();
attributeSet.add(attrDef);
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attributeSet, connectorSet, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attributeSet, connectorSet);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML1NameIdentifierAttributeDefinitionTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML1NameIdentifierAttributeDefinitionTest.java
index fc3cf97..8d3e1e7 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML1NameIdentifierAttributeDefinitionTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML1NameIdentifierAttributeDefinitionTest.java
@@ -89,7 +89,7 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
am.add(defn);
am.add(TestSources.populatedStaticAttribute());
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, null, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, null);
resolver.initialize();
final AttributeResolutionContext context = TestSources.createResolutionContext(null, TestSources.IDP_ENTITY_ID, null);
@@ -134,7 +134,7 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
final Set<AttributeDefinition> am = new LazySet<>();
am.add(defn);
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, Collections.singleton((DataConnector)ResolverTestSupport.buildDataConnector("connector1", attr)), null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, Collections.singleton((DataConnector)ResolverTestSupport.buildDataConnector("connector1", attr)));
resolver.initialize();
final AttributeResolutionContext context = TestSources.createResolutionContext(null, TestSources.IDP_ENTITY_ID, null);
@@ -170,7 +170,7 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
final Set<AttributeDefinition> am = new LazySet<>();
am.add(defn);
am.add(TestSources.populatedStaticAttribute());
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, null, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, null);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -201,7 +201,7 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
am.add(TestSources.populatedStaticAttribute());
am.add(defn2);
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, null, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, null);
resolver.initialize();
//
@@ -231,7 +231,7 @@ public class SAML1NameIdentifierAttributeDefinitionTest extends OpenSAMLInitBase
am.add(defn);
am.add(TestSources.populatedStaticAttribute(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR, 1));
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, null, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, null);
resolver.initialize();
final AttributeResolutionContext context = TestSources.createResolutionContext(null, TestSources.IDP_ENTITY_ID, null);
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML2NameIDAttributeDefinitionTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML2NameIDAttributeDefinitionTest.java
index 55cd60e..7efb8b4 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML2NameIDAttributeDefinitionTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML2NameIDAttributeDefinitionTest.java
@@ -104,7 +104,7 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
am.add(defn);
am.add(TestSources.populatedStaticAttribute());
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, null, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, null);
resolver.initialize();
return resolver;
@@ -155,7 +155,7 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
final Set<AttributeDefinition> am = new LazySet<>();
am.add(defn);
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, Collections.singleton((DataConnector)ResolverTestSupport.buildDataConnector("connector1", attr)), null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, Collections.singleton((DataConnector)ResolverTestSupport.buildDataConnector("connector1", attr)));
resolver.initialize();
final AttributeResolutionContext context = TestSources.createResolutionContext(null, TestSources.IDP_ENTITY_ID, null);
@@ -221,7 +221,7 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
am.add(TestSources.populatedStaticAttribute());
am.add(defn2);
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, null, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, null);
resolver.initialize();
final AttributeResolutionContext context =
@@ -254,7 +254,7 @@ public class SAML2NameIDAttributeDefinitionTest extends OpenSAMLInitBaseTestCase
am.add(defn);
am.add(TestSources.populatedStaticAttribute(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR, 1));
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, null, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, null);
resolver.initialize();
final AttributeResolutionContext context = TestSources.createResolutionContext(null, TestSources.IDP_ENTITY_ID, TestSources.SP_ENTITY_ID);
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java
index 951c8a4..d5a3c8a 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java
@@ -87,7 +87,7 @@ public class ScopedAttributeTest {
final Set<AttributeDefinition> attributeSet = new LazySet<>();
attributeSet.add(scoped);
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attributeSet, connectorSet, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attributeSet, connectorSet);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
index 316277d..7bcf045 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
@@ -367,7 +367,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final Set<DataConnector> dataDefinitions = new LazySet<>();
dataDefinitions.add(TestSources.populatedStaticConnector());
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, dataDefinitions, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, dataDefinitions);
resolver.initialize();
final AttributeResolutionContext context = generateContext();
@@ -400,7 +400,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final Set<DataConnector> dataDefinitions = new LazySet<>();
dataDefinitions.add(TestSources.populatedStaticConnector());
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, dataDefinitions, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, dataDefinitions);
resolver.initialize();
final AttributeResolutionContext context = generateContext();
@@ -471,7 +471,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
attrDefinitions.add(nonString);
attrDefinitions.add(TestSources.populatedStaticAttribute());
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, null, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, null);
resolver.initialize();
final AttributeResolutionContext context = generateContext();
@@ -517,7 +517,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final Set<DataConnector> dataDefinitions = new LazySet<>();
dataDefinitions.add(TestSources.populatedStaticConnector());
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, dataDefinitions, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, dataDefinitions);
resolver.initialize();
final AttributeResolutionContext context = generateContext();
@@ -553,7 +553,7 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
final Set<DataConnector> dataDefinitions = Collections.singleton((DataConnector) connector);
final Set<AttributeDefinition> attrDefinitions = Collections.singleton((AttributeDefinition) scripted);
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, dataDefinitions, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, dataDefinitions);
connector.initialize();
scripted.initialize();
resolver.initialize();
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SimpleAttributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SimpleAttributeTest.java
index 2753aa7..3a83736 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SimpleAttributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SimpleAttributeTest.java
@@ -98,7 +98,7 @@ public class SimpleAttributeTest {
final Set<AttributeDefinition> attributeSet = new LazySet<>();
attributeSet.add(simple);
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attributeSet, connectorSet, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attributeSet, connectorSet);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -136,7 +136,7 @@ public class SimpleAttributeTest {
am.add(simple);
am.add(TestSources.populatedStaticAttribute());
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, null, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", am, null);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -214,7 +214,7 @@ public class SimpleAttributeTest {
final Set<DataConnector> dataDefinitions = new LazySet<>();
dataDefinitions.add(TestSources.populatedStaticConnector());
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, dataDefinitions, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, dataDefinitions);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeTest.java
index d94e0f3..eb08d31 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeTest.java
@@ -210,7 +210,7 @@ public class TemplateAttributeTest {
final Set<DataConnector> dataDefinitions = new LazySet<>();
dataDefinitions.add(TestSources.populatedStaticConnector());
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, dataDefinitions, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, dataDefinitions);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -275,7 +275,7 @@ public class TemplateAttributeTest {
final Set<DataConnector> dataDefinitions = new LazySet<>();
dataDefinitions.add(TestSources.populatedStaticConnector());
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, dataDefinitions, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, dataDefinitions);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -319,7 +319,7 @@ public class TemplateAttributeTest {
attrDefinitions.add(templateDef);
attrDefinitions.add(simple);
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, Collections.EMPTY_SET, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, Collections.EMPTY_SET);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -352,7 +352,7 @@ public class TemplateAttributeTest {
attrDefinitions.add(TestSources.populatedStaticAttribute());
attrDefinitions.add(TestSources.populatedStaticAttribute(otherAttrName, 1));
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, Collections.EMPTY_SET, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, Collections.EMPTY_SET);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -384,7 +384,7 @@ public class TemplateAttributeTest {
attrDefinitions.add(TestSources.populatedStaticAttribute());
attrDefinitions.add(TestSources.populatedStaticAttribute(otherAttrName, 0));
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, Collections.EMPTY_SET, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, Collections.EMPTY_SET);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -415,7 +415,7 @@ public class TemplateAttributeTest {
attrDefinitions.add(templateDef);
attrDefinitions.add(simple);
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, Collections.EMPTY_SET, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("foo", attrDefinitions, Collections.EMPTY_SET);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java
index f2ca8c0..7978191 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java
@@ -101,7 +101,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
set.add(TestSources.populatedStaticAttribute(TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR, 1));
final AttributeResolverImpl resolver =
- AttributeResolverImplTest.newAttributeResolverImpl("atresolver", set, Collections.singleton((DataConnector) connector), null);
+ AttributeResolverImplTest.newAttributeResolverImpl("atresolver", set, Collections.singleton((DataConnector) connector));
simple.initialize();
resolver.initialize();
@@ -169,7 +169,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
set.add(TestSources.populatedStaticAttribute(
TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR, values));
- return AttributeResolverImplTest.newAttributeResolverImpl("atresolver", set, Collections.singleton((DataConnector) connector), null);
+ return AttributeResolverImplTest.newAttributeResolverImpl("atresolver", set, Collections.singleton((DataConnector) connector));
}
private AttributeResolver constructResolverWithNonString(final String dependantOn)
@@ -195,7 +195,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR, 1));
set.add(TestSources.nonStringAttributeDefiniton(dependantOn));
- return AttributeResolverImplTest.newAttributeResolverImpl("atresolver", set, Collections.singleton((DataConnector) connector), null);
+ return AttributeResolverImplTest.newAttributeResolverImpl("atresolver", set, Collections.singleton((DataConnector) connector));
}
protected static AbstractPersistentIdDataConnector connectorFromResolver(final AttributeResolver resolver) {
@@ -314,7 +314,7 @@ public class ComputedIDDataConnectorTest extends OpenSAMLInitBaseTestCase {
simple.initialize();
final AttributeResolver resolver =
- AttributeResolverImplTest.newAttributeResolverImpl("atresolver", Collections.singleton((AttributeDefinition) simple), set, null);
+ AttributeResolverImplTest.newAttributeResolverImpl("atresolver", Collections.singleton((AttributeDefinition) simple), set);
ComponentSupport.initialize(resolver);
final AttributeResolutionContext context =
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
index 79119b7..3008085 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
@@ -69,7 +69,7 @@ public class AttributeResolverImplTest {
dataCon.initialize();
final AttributeResolverImpl resolver =
newAttributeResolverImpl("toto", Collections.singleton((AttributeDefinition) attrDef),
- Collections.singleton((DataConnector) dataCon), null);
+ Collections.singleton((DataConnector) dataCon));
Assert.assertFalse(attrDef.isInitialized());
Assert.assertFalse(attrDef.isDestroyed());
@@ -112,14 +112,14 @@ public class AttributeResolverImplTest {
definitions.add(null);
definitions.add(new MockAttributeDefinition("bar", new IdPAttribute("test")));
- final AttributeResolverImpl resolver = newAttributeResolverImpl(" foo ", definitions, null, null);
+ final AttributeResolverImpl resolver = newAttributeResolverImpl(" foo ", definitions, null);
resolver.initialize();
Assert.assertNotNull(resolver.getAttributeDefinitions());
Assert.assertEquals(resolver.getAttributeDefinitions().size(), 2);
definitions.add(new MockAttributeDefinition("foo", new IdPAttribute("test")));
try {
- newAttributeResolverImpl(" foo ", definitions, null, null);
+ newAttributeResolverImpl(" foo ", definitions, null);
Assert.fail();
} catch (final IllegalArgumentException e) {
// OK
@@ -133,13 +133,13 @@ public class AttributeResolverImplTest {
connectors.add(null);
connectors.add(new MockDataConnector("bar", (Map) null));
- final AttributeResolver resolver = newAttributeResolverImpl("foo", null, connectors, null);
+ final AttributeResolver resolver = newAttributeResolverImpl("foo", null, connectors);
Assert.assertNotNull(resolver.getDataConnectors());
Assert.assertEquals(resolver.getDataConnectors().size(), 2);
connectors.add(new MockDataConnector("foo", (Map) null));
try {
- newAttributeResolverImpl(" foo ", null, connectors, null);
+ newAttributeResolverImpl(" foo ", null, connectors);
Assert.fail();
} catch (final IllegalArgumentException e) {
// OK
@@ -155,7 +155,7 @@ public class AttributeResolverImplTest {
definitions.add(new MockAttributeDefinition("ad1", attribute));
definitions.iterator().next().initialize();
- final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null, null);
+ final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -174,7 +174,7 @@ public class AttributeResolverImplTest {
definitions.add(new MockAttributeDefinition("ad1", attribute));
definitions.iterator().next().initialize();
- final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null, null);
+ final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null);
resolver.initialize();
AttributeResolutionContext context = new AttributeResolutionContext();
@@ -202,7 +202,7 @@ public class AttributeResolverImplTest {
attrDef.setPropagateResolutionExceptions(true);
definitions.add(attrDef);
- AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null, null);
+ AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null);
attrDef.initialize();
resolver.initialize();
@@ -219,7 +219,7 @@ public class AttributeResolverImplTest {
attrDef.setPropagateResolutionExceptions(false);
definitions.add(attrDef);
- resolver = newAttributeResolverImpl("foo", definitions, null, null);
+ resolver = newAttributeResolverImpl("foo", definitions, null);
resolver.initialize();
attrDef.initialize();
@@ -234,7 +234,7 @@ public class AttributeResolverImplTest {
@Test public void resolveEmpty() throws Exception {
final LazySet<AttributeDefinition> definitions = new LazySet<>();
- final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null, null);
+ final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -274,7 +274,7 @@ public class AttributeResolverImplTest {
definitions.add(ad2);
ad2.initialize();
- final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, connectors, null);
+ final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, connectors);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -314,7 +314,7 @@ public class AttributeResolverImplTest {
definitions.add(ad2);
ad2.initialize();
- final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, connectors, null);
+ final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, connectors);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -348,7 +348,7 @@ public class AttributeResolverImplTest {
final LazySet<AttributeDefinition> definitions = new LazySet<>();
definitions.add(ad1);
- final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, connectors, null);
+ final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, connectors);
dc1.initialize();
ad1.initialize();
resolver.initialize();
@@ -389,7 +389,7 @@ public class AttributeResolverImplTest {
connectors.add(dc2);
connectors.add(dc1);
- final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", Collections.singleton((AttributeDefinition)ad), connectors, null);
+ final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", Collections.singleton((AttributeDefinition)ad), connectors);
resolver.initialize();
AttributeResolutionContext context = new AttributeResolutionContext();
@@ -437,7 +437,7 @@ public class AttributeResolverImplTest {
final LazySet<AttributeDefinition> definitions = new LazySet<>();
definitions.add(ad1);
- final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, connectors, null);
+ final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, connectors);
dc1.initialize();
ad1.initialize();
resolver.initialize();
@@ -476,7 +476,7 @@ public class AttributeResolverImplTest {
definitions.add(ad1);
definitions.add(ad2);
- AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, connectors, null);
+ AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, connectors);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -514,7 +514,7 @@ public class AttributeResolverImplTest {
definitions.add(ad10);
definitions.add(ad11);
- resolver = newAttributeResolverImpl("failoverTest", definitions, connectors, null);
+ resolver = newAttributeResolverImpl("failoverTest", definitions, connectors);
resolver.initialize();
}
@@ -541,7 +541,7 @@ public class AttributeResolverImplTest {
final LazySet<AttributeDefinition> definitions = new LazySet<>();
definitions.add(ad1);
- final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, connectors, null);
+ final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, connectors);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -572,7 +572,7 @@ public class AttributeResolverImplTest {
final LazySet<AttributeDefinition> definitions = new LazySet<>();
definitions.add(ad1);
- final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, connectors, null);
+ final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, connectors);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -590,7 +590,7 @@ public class AttributeResolverImplTest {
definitions.add(new MockAttributeDefinition("ad1", new IdPAttribute("test")));
definitions.iterator().next().initialize();
- final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null, null);
+ final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -614,7 +614,7 @@ public class AttributeResolverImplTest {
definitions.add(definition);
definition.initialize();
- final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null, null);
+ final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -634,7 +634,7 @@ public class AttributeResolverImplTest {
definitions.add(definition);
definition.initialize();
- final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null, null);
+ final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -655,7 +655,7 @@ public class AttributeResolverImplTest {
definitions.add(definition);
definition.initialize();
- AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null, null);
+ AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null);
resolver.initialize();
AttributeResolutionContext context = new AttributeResolutionContext();
@@ -664,7 +664,7 @@ public class AttributeResolverImplTest {
Assert.assertTrue(context.getResolvedIdPAttributes().containsKey("ad1"));
Assert.assertEquals(context.getResolvedIdPAttributes().get("ad1").getValues().size(),2);
- resolver = newAttributeResolverImpl("foo", definitions, null, null);
+ resolver = newAttributeResolverImpl("foo", definitions, null);
resolver.setStripNulls(true);
resolver.initialize();
@@ -689,7 +689,7 @@ public class AttributeResolverImplTest {
definitions.add(definition);
definition.initialize();
- final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null, null);
+ final AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null);
resolver.initialize();
final AttributeResolutionContext context = new AttributeResolutionContext();
@@ -714,7 +714,7 @@ public class AttributeResolverImplTest {
definitions.add(ad0);
definitions.add(ad1);
- AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null, null);
+ AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null);
try {
resolver.initialize();
Assert.fail("invalid resolver configuration didn't fail initialization");
@@ -729,7 +729,7 @@ public class AttributeResolverImplTest {
definitions.add(ad0);
ad0.initialize();
- resolver = newAttributeResolverImpl("foo", definitions, null, null);
+ resolver = newAttributeResolverImpl("foo", definitions, null);
try {
resolver.initialize();
@@ -755,7 +755,7 @@ public class AttributeResolverImplTest {
definitions.add(ad0);
definitions.add(ad1);
- AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null, null);
+ AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null);
try {
resolver.initialize();
Assert.fail("invalid resolver configuration didn't fail initialization");
@@ -770,7 +770,7 @@ public class AttributeResolverImplTest {
definitions.add(ad0);
ad0.initialize();
- resolver = newAttributeResolverImpl("foo", definitions, null, null);
+ resolver = newAttributeResolverImpl("foo", definitions, null);
try {
resolver.initialize();
@@ -788,7 +788,7 @@ public class AttributeResolverImplTest {
LazySet<AttributeDefinition> definitions = new LazySet<>();
definitions.add(ad1);
ad1.initialize();
- AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null, null);
+ AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null);
try {
resolver.initialize();
@@ -819,7 +819,7 @@ public class AttributeResolverImplTest {
definitions.add(ad1);
definitions.add(ad2);
- resolver = newAttributeResolverImpl("foo", definitions, connectors, null);
+ resolver = newAttributeResolverImpl("foo", definitions, connectors);
try {
resolver.initialize();
Assert.fail("invalid resolver configuration didn't fail initialization");
@@ -837,7 +837,7 @@ public class AttributeResolverImplTest {
LazySet<AttributeDefinition> definitions = new LazySet<>();
definitions.add(ad1);
ad1.initialize();
- AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null, null);
+ AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null);
try {
resolver.initialize();
@@ -868,7 +868,7 @@ public class AttributeResolverImplTest {
definitions.add(ad1);
definitions.add(ad2);
- resolver = newAttributeResolverImpl("foo", definitions, connectors, null);
+ resolver = newAttributeResolverImpl("foo", definitions, connectors);
try {
resolver.initialize();
Assert.fail("invalid resolver configuration didn't fail initialization");
@@ -880,13 +880,13 @@ public class AttributeResolverImplTest {
@Test public void testPrincipalConnector() throws ComponentInitializationException, ResolutionException {
final LazySet<AttributeDefinition> definitions = new LazySet<>();
- AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null, null);
+ AttributeResolverImpl resolver = newAttributeResolverImpl("foo", definitions, null);
resolver.initialize();
Assert.assertNull(resolver.canonicalize(null));
resolver =
- newAttributeResolverImpl("foo", definitions, null,
+ newAttributeResolverWithPrincipalConnector("foo", definitions, null,
new LegacyPrincipalDecoder() {
@Override @Nullable public String canonicalize(final SubjectCanonicalizationContext context)
@@ -902,7 +902,7 @@ public class AttributeResolverImplTest {
Assert.assertEquals(resolver.canonicalize(null), "Principal");
}
- public static AttributeResolverImpl newAttributeResolverImpl(@Nonnull @NotEmpty final String resolverId,
+ public static AttributeResolverImpl newAttributeResolverWithPrincipalConnector(@Nonnull @NotEmpty final String resolverId,
@Nullable @NullableElements final Collection<AttributeDefinition> definitions,
@Nullable @NullableElements final Collection<DataConnector> connectors,
@Nullable final LegacyPrincipalDecoder principalResolver) {
@@ -913,4 +913,11 @@ public class AttributeResolverImplTest {
result.setPrincipalDecoder(principalResolver);
return result;
}
+
+ public static AttributeResolverImpl newAttributeResolverImpl(@Nonnull @NotEmpty final String resolverId,
+ @Nullable @NullableElements final Collection<AttributeDefinition> definitions,
+ @Nullable @NullableElements final Collection<DataConnector> connectors) {
+ return newAttributeResolverWithPrincipalConnector(resolverId, definitions, connectors, null);
+ }
+
}
\ No newline at end of file
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java
index e4abdd1..7d88285 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java
@@ -73,7 +73,7 @@ public class ResolveAttributesTest {
final AttributeDefinition ad1 = new MockAttributeDefinition("ad1", attribute);
definitions.add(ad1);
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("resolver", definitions, null, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("resolver", definitions, null);
ad1.initialize();
resolver.initialize();
@@ -107,7 +107,7 @@ public class ResolveAttributesTest {
final AttributeDefinition ad1 = new MockAttributeDefinition("ad1", attribute);
definitions.add(ad1);
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("resolver", definitions, null, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("resolver", definitions, null);
ad1.initialize();
resolver.initialize();
@@ -166,7 +166,7 @@ public class ResolveAttributesTest {
final AttributeDefinition ad1 = new MockAttributeDefinition("ad1", new ResolutionException());
definitions.add(ad1);
- final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("resolver", definitions, null, null);
+ final AttributeResolverImpl resolver = AttributeResolverImplTest.newAttributeResolverImpl("resolver", definitions, null);
ad1.initialize();
resolver.initialize();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list