[java-shib-metadata] branch main updated: JSMD-1 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-metadata.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=87dc1a3c638b7035800ee4121bb2f6887641dff5

The following commit(s) were added to refs/heads/main by this push:
     new 87dc1a3c JSMD-1 Remove deprecations
87dc1a3c is described below

commit 87dc1a3c638b7035800ee4121bb2f6887641dff5
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Nov 2 15:15:47 2022 +0000

    JSMD-1 Remove deprecations
    
    https://shibboleth.atlassian.net/browse/JSMD-1
    
    Remove deprecated 'EntityRoleWhiteList' filter
---
 .../spring/metadata/MetadataNamespaceHandler.java  |  5 +-
 .../filter/DeprecatedEntityRoleFilterParser.java   | 54 ----------------------
 .../main/resources/schema/shibboleth-metadata.xsd  | 11 -----
 3 files changed, 1 insertion(+), 69 deletions(-)

diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/MetadataNamespaceHandler.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/MetadataNamespaceHandler.java
index ec9aab8a..f3f9cf1d 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/MetadataNamespaceHandler.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/MetadataNamespaceHandler.java
@@ -22,7 +22,6 @@ import javax.xml.namespace.QName;
 import net.shibboleth.shared.spring.custom.BaseSpringNamespaceHandler;
 import net.shibboleth.spring.metadata.filter.AlgorithmFilterParser;
 import net.shibboleth.spring.metadata.filter.ByReferenceParser;
-import net.shibboleth.spring.metadata.filter.DeprecatedEntityRoleFilterParser;
 import net.shibboleth.spring.metadata.filter.EntitiesDescriptorNameParser;
 import net.shibboleth.spring.metadata.filter.EntityAttributesFilterParser;
 import net.shibboleth.spring.metadata.filter.EntityRoleFilterParser;
@@ -35,7 +34,7 @@ import net.shibboleth.spring.metadata.filter.SchemaValidationParser;
 import net.shibboleth.spring.metadata.filter.SignatureValidationParser;
 
 /** Namespace handler for <code>urn:mace:shibboleth:2.0:metadata</code>. */
- at SuppressWarnings("removal")
+
 public class MetadataNamespaceHandler extends BaseSpringNamespaceHandler {
 
     /** Metadata provider element name. */
@@ -70,8 +69,6 @@ public class MetadataNamespaceHandler extends BaseSpringNamespaceHandler {
         registerBeanDefinitionParser(EntityAttributesFilterParser.TYPE_NAME, new EntityAttributesFilterParser());
         registerBeanDefinitionParser(NameIDFormatFilterParser.TYPE_NAME, new NameIDFormatFilterParser());
         registerBeanDefinitionParser(EntityRoleFilterParser.TYPE_NAME, new EntityRoleFilterParser());
-        registerBeanDefinitionParser(DeprecatedEntityRoleFilterParser.TYPE_NAME,
-                new DeprecatedEntityRoleFilterParser());
         registerBeanDefinitionParser(SchemaValidationParser.TYPE_NAME, new SchemaValidationParser());
         registerBeanDefinitionParser(SignatureValidationParser.TYPE_NAME, new SignatureValidationParser());
         registerBeanDefinitionParser(NodeProcessingParser.TYPE_NAME, new NodeProcessingParser());
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/DeprecatedEntityRoleFilterParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/DeprecatedEntityRoleFilterParser.java
deleted file mode 100644
index 0fb9585f..00000000
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/DeprecatedEntityRoleFilterParser.java
+++ /dev/null
@@ -1,54 +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.spring.metadata.filter;
-
-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.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
-import net.shibboleth.spring.metadata.AbstractMetadataProviderParser;
-
-
-/**
- * Parser for a <EntityRoleWhiteListt> filter.
- * 
- * @deprecated
- */
- at Deprecated(forRemoval=true, since="4.1.0")
-public class DeprecatedEntityRoleFilterParser extends EntityRoleFilterParser {
-
-    /** Deprecated Element name. */
-    @Nonnull public static final QName TYPE_NAME = new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE,
-            "EntityRoleWhiteList");
-
-    /** {@inheritDoc} */
-    @Override protected void doParse(final Element element, final ParserContext parserContext,
-            final BeanDefinitionBuilder builder) {
-        
-        DeprecationSupport.warn(ObjectType.XSITYPE, TYPE_NAME.getLocalPart(),
-                parserContext.getReaderContext().getResource().getDescription(),
-                EntityRoleFilterParser.TYPE_NAME.getLocalPart());
-        super.doParse(element, parserContext, builder);
-    }
-
-}
\ No newline at end of file
diff --git a/shib-metadata-spring/src/main/resources/schema/shibboleth-metadata.xsd b/shib-metadata-spring/src/main/resources/schema/shibboleth-metadata.xsd
index 5dc245c9..a5a3730f 100644
--- a/shib-metadata-spring/src/main/resources/schema/shibboleth-metadata.xsd
+++ b/shib-metadata-spring/src/main/resources/schema/shibboleth-metadata.xsd
@@ -1033,17 +1033,6 @@
         </complexContent>
     </complexType>
     
-    <complexType name="EntityRoleWhiteList">
-        <annotation>
-            <documentation>
-                DEPRECATED name for EntityRole filter.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="shibmd:EntityRole" />
-        </complexContent>
-    </complexType>
-    
     <complexType name="EntityAttributes">
         <annotation>
             <documentation>

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