[java-identity-provider] 04/06: IDP-1457 Remove Legacy (V2) scripting support for attribute resolver.

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=1a34d057641c4b344b137b60d2339879e1a94faf

commit 1a34d057641c4b344b137b60d2339879e1a94faf
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Jun 1 14:36:01 2022 +0100

    IDP-1457 Remove Legacy (V2) scripting support for attribute resolver.
    
    https://shibboleth.atlassian.net/browse/IDP-1457
    
    Remove legacy (V2) templated builders
---
 ...ibleTemplatedExecutableSearchFilterBuilder.java | 51 ----------------------
 ...patibleTemplatedExecutableStatementBuilder.java | 49 ---------------------
 2 files changed, 100 deletions(-)

diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/V2CompatibleTemplatedExecutableSearchFilterBuilder.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/V2CompatibleTemplatedExecutableSearchFilterBuilder.java
deleted file mode 100644
index a8b8ad785..000000000
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/V2CompatibleTemplatedExecutableSearchFilterBuilder.java
+++ /dev/null
@@ -1,51 +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.dc.ldap.impl;
-
-import javax.annotation.Nonnull;
-
-import org.apache.velocity.VelocityContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.provider.V2SAMLProfileRequestContext;
-import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
-import net.shibboleth.idp.attribute.resolver.dc.ldap.TemplatedExecutableSearchFilterBuilder;
-
-/**
- * A {@link TemplatedExecutableSearchFilterBuilder} which also injects an
- * {@link V2SAMLProfileRequestContext} into the spring context.
- */
-public class V2CompatibleTemplatedExecutableSearchFilterBuilder extends TemplatedExecutableSearchFilterBuilder {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(V2CompatibleTemplatedExecutableSearchFilterBuilder.class);
-
-
-    /** {@inheritDoc} */
-    protected void addExtraVelocityContext(@Nonnull final VelocityContext velocityContext,
-            @Nonnull final AttributeResolutionContext resolutionContext) {
-        if (isV2Compatibility()) {
-            final V2SAMLProfileRequestContext requestContext = new V2SAMLProfileRequestContext(resolutionContext, null);
-            log.trace("Adding v2 request context {}", requestContext);
-            velocityContext.put("requestContext", requestContext);
-        }
-        super.addExtraVelocityContext(velocityContext, resolutionContext);
-    }
-
-}
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/V2CompatibleTemplatedExecutableStatementBuilder.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/V2CompatibleTemplatedExecutableStatementBuilder.java
deleted file mode 100644
index 8bd0ef659..000000000
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/V2CompatibleTemplatedExecutableStatementBuilder.java
+++ /dev/null
@@ -1,49 +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.dc.rdbms.impl;
-
-import javax.annotation.Nonnull;
-
-import org.apache.velocity.VelocityContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.provider.V2SAMLProfileRequestContext;
-import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
-import net.shibboleth.idp.attribute.resolver.dc.rdbms.TemplatedExecutableStatementBuilder;
-
-/**
- * A {@link TemplatedExecutableStatementBuilder} which also injects an
- * {@link V2SAMLProfileRequestContext} into the spring context.
- */
-public class V2CompatibleTemplatedExecutableStatementBuilder extends TemplatedExecutableStatementBuilder {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(V2CompatibleTemplatedExecutableStatementBuilder.class);
-
-    /** {@inheritDoc} */
-    protected void addExtraVelocityContext(@Nonnull final VelocityContext velocityContext,
-            @Nonnull final AttributeResolutionContext resolutionContext) {
-        if (isV2Compatibility()) {
-            final V2SAMLProfileRequestContext requestContext = new V2SAMLProfileRequestContext(resolutionContext, null);
-            log.trace("Adding v2 request context {}", requestContext);
-            velocityContext.put("requestContext", requestContext);
-        }
-        super.addExtraVelocityContext(velocityContext, resolutionContext);
-    }
-}

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