[java-identity-provider] 43/51: IDP-1409 Remove PrincipalAuthenticationMethod Attribute Name parsing

Rod Widdowson rdw at steadingsoftware.com
Wed Feb 6 08:43:14 EST 2019 

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

commit e18c7291005c62494eeadaca16ba97f6e1dc11ae
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Jan 30 17:25:34 2019 +0000

    IDP-1409 Remove PrincipalAuthenticationMethod Attribute Name parsing
    
    https://issues.shibboleth.net/jira/browse/IDP-1409
---
 ...henticationMethodAttributeDefinitionParser.java | 52 ----------------------
 .../impl/AttributeResolverNamespaceHandler.java    |  3 --
 ...icationMethodAttributeDefinitionParserTest.java | 38 ----------------
 .../ad/resolver/principalAuthenticationMethod.xml  |  6 ---
 4 files changed, 99 deletions(-)

diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalAuthenticationMethodAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalAuthenticationMethodAttributeDefinitionParser.java
deleted file mode 100644
index 82997fa..0000000
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalAuthenticationMethodAttributeDefinitionParser.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements.  See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.attribute.resolver.spring.ad.impl;
-
-import javax.annotation.Nonnull;
-import javax.xml.namespace.QName;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import net.shibboleth.idp.attribute.resolver.ad.impl.PrincipalAuthenticationMethodAttributeDefinition;
-import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
-import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-
-/** Spring Bean Definition Parser for PrincipalAuthenticationMethod. */
-public class PrincipalAuthenticationMethodAttributeDefinitionParser extends BaseAttributeDefinitionParser {
-
-    /** Schema type name. */
-    @Nonnull public static final QName TYPE_NAME_RESOLVER =
-            new QName(AttributeResolverNamespaceHandler.NAMESPACE, "PrincipalAuthenticationMethod");
-
-    /** {@inheritDoc} */
-    @Override protected Class<PrincipalAuthenticationMethodAttributeDefinition> getBeanClass(final Element element) {
-        return PrincipalAuthenticationMethodAttributeDefinition.class;
-    }
-    
-    @Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
-            @Nonnull final BeanDefinitionBuilder builder) {
-        DeprecationSupport.warnOnce(ObjectType.ELEMENT, "PrincipalAuthenticationMethod",
-                parserContext.getReaderContext().getResource().getDescription(), null);
-        super.doParse(config, parserContext, builder);
-    }
-
-}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java
index e99c844..1eea82b 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java
@@ -25,7 +25,6 @@ import net.shibboleth.ext.spring.util.BaseSpringNamespaceHandler;
 import net.shibboleth.idp.attribute.resolver.spring.ad.impl.ContextDerivedAttributeDefinitionParser;
 import net.shibboleth.idp.attribute.resolver.spring.ad.impl.CryptoTransientIdAttributeDefinitionParser;
 import net.shibboleth.idp.attribute.resolver.spring.ad.impl.PrescopedAttributeDefinitionParser;
-import net.shibboleth.idp.attribute.resolver.spring.ad.impl.PrincipalAuthenticationMethodAttributeDefinitionParser;
 import net.shibboleth.idp.attribute.resolver.spring.ad.impl.PrincipalNameAttributeDefinitionParser;
 import net.shibboleth.idp.attribute.resolver.spring.ad.impl.RegexSplitAttributeDefinitionParser;
 import net.shibboleth.idp.attribute.resolver.spring.ad.impl.SAML1NameIdentifierAttributeDefinitionParser;
@@ -80,8 +79,6 @@ public class AttributeResolverNamespaceHandler extends BaseSpringNamespaceHandle
                 new CryptoTransientIdAttributeDefinitionParser());
         registerBeanDefinitionParser(PrescopedAttributeDefinitionParser.TYPE_NAME_RESOLVER,
                 new PrescopedAttributeDefinitionParser());
-        registerBeanDefinitionParser(PrincipalAuthenticationMethodAttributeDefinitionParser.TYPE_NAME_RESOLVER,
-                new PrincipalAuthenticationMethodAttributeDefinitionParser());
         registerBeanDefinitionParser(PrincipalNameAttributeDefinitionParser.TYPE_NAME_RESOLVER,
                 new PrincipalNameAttributeDefinitionParser());
         registerBeanDefinitionParser(RegexSplitAttributeDefinitionParser.TYPE_NAME_RESOLVER,
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrincipalAuthenticationMethodAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrincipalAuthenticationMethodAttributeDefinitionParserTest.java
deleted file mode 100644
index f8349e7..0000000
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrincipalAuthenticationMethodAttributeDefinitionParserTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements.  See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.attribute.resolver.spring.ad;
-
-import net.shibboleth.idp.attribute.resolver.ad.impl.PrincipalAuthenticationMethodAttributeDefinition;
-import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import net.shibboleth.idp.attribute.resolver.spring.ad.impl.PrincipalAuthenticationMethodAttributeDefinitionParser;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * Test for {@link PrincipalAuthenticationMethodAttributeDefinitionParser}.
- */
-public class PrincipalAuthenticationMethodAttributeDefinitionParserTest extends BaseAttributeDefinitionParserTest {
-
-    @Test public void resolver() {
-        PrincipalAuthenticationMethodAttributeDefinition attrDef =
-                getAttributeDefn("resolver/principalAuthenticationMethod.xml", PrincipalAuthenticationMethodAttributeDefinition.class);
-
-        Assert.assertEquals(attrDef.getId(), "PrincipalAuthenticationMethod");
-    }
-}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/principalAuthenticationMethod.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/principalAuthenticationMethod.xml
deleted file mode 100644
index addef67..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/principalAuthenticationMethod.xml
+++ /dev/null
@@ -1,6 +0,0 @@
- <AttributeDefinition 
-    xmlns="urn:mace:shibboleth:2.0:resolver"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    dependencyOnly="1"
-    xsi:type="PrincipalAuthenticationMethod" id="PrincipalAuthenticationMethod"
-    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"/>

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

More information about the commits mailing list