[java-identity-provider] 03/06: IDP-1121 Static data connector cannot have a FailoverDataConnector

[Rod Widdowson]

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=d2e87e25edb9a6ca688b7d18e163a1260be15fe7

commit d2e87e25edb9a6ca688b7d18e163a1260be15fe7
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Apr 2 16:32:38 2019 +0100

    IDP-1121  Static data connector cannot have a FailoverDataConnector
    
    https://issues.shibboleth.net/jira/browse/IDP-1121
---
 .../spring/dc/impl/StaticDataConnectorParser.java       |  7 -------
 .../spring/dc/StaticDataConnectorParserTest.java        | 14 --------------
 .../resolver/spring/dc/resolver/staticMultiFallback.xml | 17 -----------------
 .../resources/schema/shibboleth-attribute-resolver.xsd  |  1 -
 4 files changed, 39 deletions(-)

diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParser.java
index ab51949..2ba3dc0 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParser.java
@@ -35,8 +35,6 @@ import net.shibboleth.idp.attribute.StringAttributeValue;
 import net.shibboleth.idp.attribute.resolver.dc.impl.StaticDataConnector;
 import net.shibboleth.idp.attribute.resolver.spring.dc.AbstractDataConnectorParser;
 import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
 
@@ -63,11 +61,6 @@ public class StaticDataConnectorParser extends AbstractDataConnectorParser {
     @Override protected void doV2Parse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
             @Nonnull final BeanDefinitionBuilder builder) {
         
-        if (!ElementSupport.getChildElements(config, FAILOVER_DATA_CONNECTOR_ELEMENT_NAME).isEmpty()) {
-            DeprecationSupport.warnOnce(ObjectType.ELEMENT, 
-                    FAILOVER_DATA_CONNECTOR_ELEMENT_NAME.getLocalPart(), TYPE_NAME_RESOLVER.toString(), null);
-        }
-        
         final List<Element> children = ElementSupport.getChildElements(config, ATTRIBUTE_ELEMENT_NAME_RESOLVER);
         final List<BeanDefinition> attributes = new ManagedList<>(children.size());
 
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParserTest.java
index 046edca..b3dd70a 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParserTest.java
@@ -34,20 +34,6 @@ import net.shibboleth.idp.attribute.resolver.spring.dc.impl.StaticDataConnectorP
  */
 public class StaticDataConnectorParserTest extends BaseAttributeDefinitionParserTest {
     
-    @Test public void multiFallback() {
-        final StaticDataConnector connector = getDataConnector("resolver/staticMultiFallback.xml", StaticDataConnector.class);
-        Assert.assertEquals(connector.getAttributes().keySet().size(), 2);
-        final IdPAttribute epe = connector.getAttributes().get("eduPersonEntitlement");
-        List<IdPAttributeValue<?>> values = epe.getValues();
-        Assert.assertEquals(values.size(), 2);
-        Assert.assertTrue(values.contains(new StringAttributeValue("urn:example.org:entitlement:entitlement1")));
-        Assert.assertTrue(values.contains(new StringAttributeValue("urn:mace:dir:entitlement:common-lib-terms")));
-        
-        values = connector.getAttributes().get("staticEpA").getValues();
-        Assert.assertEquals(values.size(), 1);
-        Assert.assertTrue(values.contains(new StringAttributeValue("member")));
-    }
-
     @Test public void simple() {
         final StaticDataConnector connector = getDataConnector("resolver/staticAttributes.xml", StaticDataConnector.class);
         
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/staticMultiFallback.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/staticMultiFallback.xml
deleted file mode 100644
index e93483f..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/staticMultiFallback.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DataConnector id="staticAttributes"
-	xsi:type="Static" xmlns="urn:mace:shibboleth:2.0:resolver"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	
-	xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
-    <FailoverDataConnector ref="foo"/>
-	<Attribute id="staticEpA">
-		<Value>member</Value>
-	</Attribute>
-    <FailoverDataConnector ref="foo"/>
-	<Attribute id="eduPersonEntitlement">
-		<Value>urn:example.org:entitlement:entitlement1</Value>
-		<Value>urn:mace:dir:entitlement:common-lib-terms</Value>
-	</Attribute>
-    <FailoverDataConnector ref="foo"/>
-</DataConnector>
diff --git a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
index 8c54897..e6adee4 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
@@ -1307,7 +1307,6 @@
                 <choice  maxOccurs="unbounded" minOccurs="0">
                     <element ref="resolver:InputAttributeDefinition"/>
                     <element ref="resolver:InputDataConnector"/>
-                    <element ref="resolver:FailoverDataConnector"/>
                     <element name="Attribute">
                         <annotation>
                             <documentation>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.