[java-shib-attribute] 03/06: JSATTR-5 Remove Deprecations

[Rod Widdowson]

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

rdw 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=6aeaef5dc9241e06ce14f6012e46b1067541e4e6

commit 6aeaef5dc9241e06ce14f6012e46b1067541e4e6
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Nov 21 17:00:01 2022 +0000

    JSATTR-5 Remove Deprecations
    
    https://shibboleth.atlassian.net/browse/JSATTR-5
    
    Remove  readOnlyConnection as an RDBMS DataConnector option
---
 .../spring/dc/rdbms/impl/RDBMSDataConnectorParser.java | 18 ------------------
 .../resources/schema/shibboleth-attribute-resolver.xsd |  9 +--------
 .../resolver/rdbms-attribute-resolver-v2-simple.xml    |  1 -
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
index f545a5714..17fb12aeb 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
@@ -41,9 +41,7 @@ import net.shibboleth.idp.attribute.resolver.spring.dc.impl.ManagedConnectionPar
 import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.logic.Constraint;
-import net.shibboleth.shared.primitive.DeprecationSupport;
 import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 import net.shibboleth.shared.spring.util.SpringSupport;
 import net.shibboleth.shared.xml.AttributeSupport;
 import net.shibboleth.shared.xml.ElementSupport;
@@ -98,13 +96,6 @@ public class RDBMSDataConnectorParser extends AbstractDataConnectorParser {
             }
         }
 
-        if (v2Parser.getConnectionReadOnly() != null) {
-            // V4 deprecation
-            DeprecationSupport.warnOnce(ObjectType.ATTRIBUTE, "readOnlyConnection",
-                    parserContext.getReaderContext().getResource().getDescription(),
-                    "to modify the JDBC URI (default is false)");
-        }
-
         final String mappingStrategyID = v2Parser.getBeanMappingStrategyID();
         if (mappingStrategyID != null) {
             builder.addPropertyReference("mappingStrategy", mappingStrategyID);
@@ -175,15 +166,6 @@ public class RDBMSDataConnectorParser extends AbstractDataConnectorParser {
             return parser.createDataSource();
         }
 
-        /**
-         * Get the connectionReadOnly attribute value.
-         *
-         * @return  whether connections should be read only
-         */
-        @Nullable public String getConnectionReadOnly() {
-            return AttributeSupport.getAttributeValue(configElement, new QName("readOnlyConnection"));
-         }
-
         /**
          * Get the bean ID of an externally defined search builder.
          * 
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 c6f5a2a9c..8a840fd9c 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
     xmlns:sec="urn:mace:shibboleth:2.0:security" targetNamespace="urn:mace:shibboleth:2.0:resolver"
-    elementFormDefault="qualified" version="4.3">
+    elementFormDefault="qualified" version="5.0.0">
 
     <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
     <import namespace="urn:mace:shibboleth:2.0:security" schemaLocation="http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
@@ -1159,13 +1159,6 @@
                     <element name="ResultCache" type="resolver:CacheConfigType"/>
                     <element name="ResultCacheBean" type="resolver:string"/>
                 </choice>
-                <attribute name="readOnlyConnection" type="resolver:string">
-                    <annotation>
-                        <documentation>
-                            DEPRECATED and has no function.  Read Only connections are set in the JDBC RUL
-                        </documentation>
-                    </annotation>
-                </attribute>
                 <attribute name="queryTimeout" type="resolver:string">
                     <annotation>
                         <documentation>
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-v2-simple.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-v2-simple.xml
index 664abf289..9545a4c2f 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-v2-simple.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-v2-simple.xml
@@ -7,7 +7,6 @@
         noResultIsError="true"
         failFastInitialize="true"
         multipleResultsIsError="true"
-        readOnlyConnection="false"
         noRetryDelay="PT5M">
       <SimpleManagedConnection
         jdbcDriver="org.hsqldb.jdbc.JDBCDriver"

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