[java-identity-provider] branch master updated: IDP-514 - Type conversion in data connectors

[Scott Cantor]

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

The following commit(s) were added to refs/heads/master by this push:
       new  a062db2   IDP-514 - Type conversion in data connectors
a062db2 is described below

commit a062db202561afa34ca695d88b1261fcb6e6faea
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Jun 21 12:07:40 2019 -0400

    IDP-514 - Type conversion in data connectors
    
    https://issues.shibboleth.net/jira/browse/IDP-514
    
    Remove from schema and remove parser warnings.
---
 .../dc/ldap/impl/LDAPDataConnectorParser.java      |  4 ----
 .../dc/rdbms/impl/RDBMSDataConnectorParser.java    |  5 -----
 .../schema/shibboleth-attribute-resolver.xsd       | 25 ----------------------
 3 files changed, 34 deletions(-)

diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
index 6c83887..455fa28 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
@@ -663,10 +663,6 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
                     if (columnName != null && attributeId != null) {
                         renamingMap.put(columnName, attributeId);
                     }
-
-                    if (AttributeSupport.hasAttribute(column, new QName("type"))) {
-                        log.warn("{} Column type attribute not supported for LDAP results", getLogPrefix());
-                    }
                 }
                 mapper.addPropertyValue("resultRenamingMap", renamingMap);
             }
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
index 164ad26..d67da34 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
@@ -259,11 +259,6 @@ public class RDBMSDataConnectorParser extends AbstractDataConnectorParser {
                     if (columnName != null && attributeId != null) {
                         renamingMap.put(columnName, attributeId);
                     }
-                    
-                    if (AttributeSupport.hasAttribute(column, new QName("type"))) {
-                        LoggerFactory.getLogger(RDBMSDataConnectorParser.class).warn(
-                                "{} Column type attribute is no longer supported", getLogPrefix());
-                    }
                 }
                 mapper.addPropertyValue("resultRenamingMap", renamingMap);
             }
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 9c7ba37..c20c476 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
@@ -1490,33 +1490,8 @@
                 <documentation>The name of the attribute that data from this column should be added to.</documentation>
             </annotation>
         </attribute>
-        <attribute name="type" type="resolver:ColumnDataType">
-            <annotation>
-                <documentation>The Java data type data in the column should be extracted as.</documentation>
-            </annotation>
-        </attribute>
     </complexType>
 
-    <simpleType name="ColumnDataType">
-        <restriction base="string">
-            <enumeration value="BigDecimal"/>
-            <enumeration value="Boolean"/>
-            <enumeration value="Byte"/>
-            <enumeration value="ByteArray"/>
-            <enumeration value="Date"/>
-            <enumeration value="Double"/>
-            <enumeration value="Float"/>
-            <enumeration value="Integer"/>
-            <enumeration value="Long"/>
-            <enumeration value="Object"/>
-            <enumeration value="Short"/>
-            <enumeration value="String"/>
-            <enumeration value="Time"/>
-            <enumeration value="Timestamp"/>
-            <enumeration value="URL"/>
-        </restriction>
-    </simpleType>
-
     <simpleType name="ConnectionStrategyType">
         <annotation>
             <documentation>Supported connection strategies.</documentation>

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