[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-spring/src: main/java/net/shibboleth/idp/attribute/r...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Feb 10 04:42:09 2014
New Revision: 5343

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5343&view=rev
Log:
IDP-268 Move getBeanClass to the parent class - it is invariant across all parsers

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/AbstractPrincipalConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/AbstractPrincipalConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/AbstractPrincipalConnectorParser.java?rev=5343&r1=5342&r2=5343&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/AbstractPrincipalConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/AbstractPrincipalConnectorParser.java Mon Feb 10 04:42:09 2014
@@ -23,6 +23,7 @@
 import javax.xml.namespace.QName;
 
 import net.shibboleth.idp.attribute.resolver.spring.AttributeResolverNamespaceHandler;
+import net.shibboleth.idp.saml.impl.attribute.principalconnector.PrincipalConnector;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -40,6 +41,11 @@
 
     /** Relying Parties. */
     public static final QName RELYING_PARTY = new QName(AttributeResolverNamespaceHandler.NAMESPACE, "RelyingParty");
+
+    /** {@inheritDoc} */
+    @Override protected Class<PrincipalConnector> getBeanClass(Element element) {
+        return PrincipalConnector.class;
+    }
 
     /** {@inheritDoc} */
     @Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectConnectorParser.java?rev=5343&r1=5342&r2=5343&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectConnectorParser.java Mon Feb 10 04:42:09 2014
@@ -20,7 +20,6 @@
 import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
-import net.shibboleth.idp.saml.impl.attribute.principalconnector.PrincipalConnector;
 import net.shibboleth.idp.saml.impl.nameid.DirectNameIDDecoder;
 import net.shibboleth.idp.saml.impl.nameid.DirectNameIdentifierDecoder;
 
@@ -29,17 +28,12 @@
 import org.w3c.dom.Element;
 
 /**
- * Parser for Direct &lt;PrincipalConnector&gt;.
+ * Parser for Direct Principal Connector<br/> &lt;PrincipalConnector xsi:type="pc:Direct"&gt;.
  */
 public class DirectConnectorParser extends AbstractPrincipalConnectorParser {
 
     /** Schema type name. */
     public static final QName ELEMENT_NAME = new QName(PrincipalConnectorNamespaceHandler.NAMESPACE, "Direct");
-
-    /** {@inheritDoc} */
-    @Override protected Class<PrincipalConnector> getBeanClass(Element element) {
-        return PrincipalConnector.class;
-    }
 
     /** {@inheritDoc} */
     @Override protected void addSAMLDecoders(@Nonnull final Element config, @Nonnull final ParserContext parserContext,

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java?rev=5343&r1=5342&r2=5343&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java Mon Feb 10 04:42:09 2014
@@ -26,7 +26,7 @@
 import org.testng.annotations.Test;
 
 /**
- * test for principal connector parsers.
+ * test for direct principal connector parsers.
  */
 public class DirectTest extends BaseAttributeDefinitionParserTest {