[java-shib-attribute] branch main updated: IDP-2153 - Clean resolver schema to block dependency/failover elements

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-shib-attribute.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=b60d7e96982ce2b4cffd69db1042636286815dd5

The following commit(s) were added to refs/heads/main by this push:
     new b60d7e969 IDP-2153 - Clean resolver schema to block dependency/failover elements
b60d7e969 is described below

commit b60d7e96982ce2b4cffd69db1042636286815dd5
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Aug 8 12:26:24 2023 -0400

    IDP-2153 - Clean resolver schema to block dependency/failover elements
    
    https://shibboleth.atlassian.net/browse/IDP-2153
---
 .../resolver/spring/dc/impl/StaticDataConnectorParser.java        | 2 +-
 .../src/main/resources/schema/shibboleth-attribute-resolver.xsd   | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParser.java
index 08bd0302a..ccefd994f 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParser.java
@@ -99,7 +99,7 @@ public class StaticDataConnectorParser extends AbstractDataConnectorParser {
     }
 
     /** {@inheritDoc} */
-    @Override protected boolean warnOnDependencies() {
+    @Override protected boolean failOnDependencies() {
         return true;
     }
 
diff --git a/shib-attribute-resolver-spring/src/main/resources/schema/shibboleth-attribute-resolver.xsd b/shib-attribute-resolver-spring/src/main/resources/schema/shibboleth-attribute-resolver.xsd
index 4a61215a2..f3d786277 100644
--- a/shib-attribute-resolver-spring/src/main/resources/schema/shibboleth-attribute-resolver.xsd
+++ b/shib-attribute-resolver-spring/src/main/resources/schema/shibboleth-attribute-resolver.xsd
@@ -1457,10 +1457,8 @@
         </annotation>
         <complexContent>
             <extension base="resolver:BaseDataConnectorType">
-                <choice  maxOccurs="unbounded" minOccurs="0">
-                    <element ref="resolver:InputAttributeDefinition"/>
-                    <element ref="resolver:InputDataConnector"/>
-                    <element name="Attribute">
+                <sequence>
+                    <element name="Attribute" minOccurs="0" maxOccurs="unbounded">
                         <annotation>
                             <documentation>
                                 Specifies an attribute, and its values, to be exposed by this connector.
@@ -1484,7 +1482,7 @@
                             </attribute>
                         </complexType>
                     </element>
-                </choice>
+                </sequence>
                 <attribute name="attributeListRef" type="resolver:string">
                     <annotation>
                         <documentation>

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