[java-identity-provider] branch master updated: IDP-1364 Deprecate JNDIConnectionPropertyHandle element

[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=2601e7592e7e7be65ed5aa3e778e7c8480b9658e

The following commit(s) were added to refs/heads/master by this push:
       new  2601e75   IDP-1364 Deprecate JNDIConnectionPropertyHandle element
2601e75 is described below

commit 2601e7592e7e7be65ed5aa3e778e7c8480b9658e
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Nov 19 16:45:39 2018 +0000

    IDP-1364 Deprecate JNDIConnectionPropertyHandle element
    
    https://issues.shibboleth.net/jira/browse/IDP-1364
---
 .../resolver/spring/dc/impl/ManagedConnectionParser.java       | 10 ++++++----
 .../attribute/resolver/spring/dc/ManagedConnectionTest.java    | 10 ++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ManagedConnectionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ManagedConnectionParser.java
index e5022a8..abbaf8b 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ManagedConnectionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ManagedConnectionParser.java
@@ -152,11 +152,13 @@ public class ManagedConnectionParser {
                 DataConnectorNamespaceHandler.NAMESPACE, "JNDIConnectionProperty");
         elements.addAll(ElementSupport.getChildElementsByTagNameNS(containerManagedElement,
                 AttributeResolverNamespaceHandler.NAMESPACE, "JNDIConnectionProperty"));
-        for (final Element e : elements) {
-            props.put(AttributeSupport.getAttributeValue(e, new QName("name")),
-                    AttributeSupport.getAttributeValue(e, new QName("value")));
+        if (!elements.isEmpty()) {
+            DeprecationSupport.warnOnce(ObjectType.ELEMENT, "<JNDIConnectionProperty>", null, null);
+            for (final Element e : elements) {
+                props.put(AttributeSupport.getAttributeValue(e, new QName("name")),
+                        AttributeSupport.getAttributeValue(e, new QName("value")));
+            }
         }
-
         final BeanDefinitionBuilder dataSource =
                 BeanDefinitionBuilder.rootBeanDefinition(ManagedConnectionParser.class, "buildDataSource");
         dataSource.addConstructorArgValue(props);
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ManagedConnectionTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ManagedConnectionTest.java
index c9f04df..ec76572 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ManagedConnectionTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ManagedConnectionTest.java
@@ -53,19 +53,19 @@ public class ManagedConnectionTest extends BaseAttributeDefinitionParserTest {
         if (!NamingManager.hasInitialContextFactoryBuilder()) {
             NamingManager.setInitialContextFactoryBuilder(new ContextFactoryBuilder() );
         }
-        
+
         final  StoredIDDataConnector connector = getDataConnector("containerManagedConnection.xml", StoredIDDataConnector.class);
         MyDataSource source = (MyDataSource) connector.getDataSource();
         assertEquals(source.getEnvironment().size(), 2);
         assertEquals(source.getEnvironment().get("foo"), "Bar");
         assertEquals(source.getEnvironment().get("yellow"), "green");
     }
-    
+
     @Test(enabled=false) public void resolver() throws ComponentInitializationException, NamingException {
         if (!NamingManager.hasInitialContextFactoryBuilder()) {
             NamingManager.setInitialContextFactoryBuilder(new ContextFactoryBuilder() );
         }
-        
+
         final  StoredIDDataConnector connector = getDataConnector("resolver/containerManagedConnection.xml", StoredIDDataConnector.class);
         MyDataSource source = (MyDataSource) connector.getDataSource();
         assertEquals(source.getEnvironment().size(), 2);
@@ -73,8 +73,6 @@ public class ManagedConnectionTest extends BaseAttributeDefinitionParserTest {
         assertEquals(source.getEnvironment().get("yellow"), "green");
     }
 
-    
-    
     /** Hard wiring for JNDI.  This is an {@link InitialContextFactoryBuilder} Its only job is to return a {@link MyContextFactory} */
     private class ContextFactoryBuilder implements InitialContextFactoryBuilder {
 
@@ -83,7 +81,7 @@ public class ManagedConnectionTest extends BaseAttributeDefinitionParserTest {
             return new MyContextFactory();
         }
     }
-    
+
     /** Hard wiring for JNDI.  This is an {@link InitialContextFactory}.  Its only job is to return an {@link MyInitialContext} */
     private class MyContextFactory implements InitialContextFactory {
 

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