[java-identity-provider] branch master updated: IDP-1397 - Removal of deprecated features

[Scott Cantor]

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

scantor 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=0d8940a191fb2fbb4bf02e21ad81ac6681f89d0f

The following commit(s) were added to refs/heads/master by this push:
       new  0d8940a   IDP-1397 - Removal of deprecated features
0d8940a is described below

commit 0d8940a191fb2fbb4bf02e21ad81ac6681f89d0f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Dec 17 12:37:06 2019 -0600

    IDP-1397 - Removal of deprecated features
    
    https://issues.shibboleth.net/jira/browse/IDP-1397
    
    Remove deprecated CAS interface.
---
 .../idp/cas/proxy/ProxyAuthenticator.java          | 45 ----------------------
 .../test/flows/cas/ServiceValidateFlowTest.java    | 18 +--------
 2 files changed, 1 insertion(+), 62 deletions(-)

diff --git a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/proxy/ProxyAuthenticator.java b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/proxy/ProxyAuthenticator.java
deleted file mode 100644
index 882df01..0000000
--- a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/proxy/ProxyAuthenticator.java
+++ /dev/null
@@ -1,45 +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.cas.proxy;
-
-import javax.annotation.Nonnull;
-import java.net.URI;
-import java.security.GeneralSecurityException;
-
-/**
- * Deprecated as of 3.4.0. Superseded by {@link ProxyValidator} interface.
- * <p>
- * Strategy pattern component for proxy callback authentication.
- *
- * @param <CriteriaType> Proxy validation criteria type.
- *
- * @author Marvin S. Addison
- * @see ProxyValidator
- */
- at Deprecated
-public interface ProxyAuthenticator<CriteriaType> {
-    /**
-     * Authenticates the proxy callback URI.
-     *
-     * @param uri Proxy callback URI to validate.
-     * @param criteria Validation criteria.
-     *
-     * @throws java.security.GeneralSecurityException On authentication failure.
-     */
-    void authenticate(@Nonnull URI uri, CriteriaType criteria) throws GeneralSecurityException;
-}
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ServiceValidateFlowTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ServiceValidateFlowTest.java
index e112f88..a23c3a6 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ServiceValidateFlowTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ServiceValidateFlowTest.java
@@ -17,13 +17,11 @@
 
 package net.shibboleth.idp.test.flows.cas;
 
-import java.net.URI;
 import java.time.Instant;
 
 import javax.annotation.Nonnull;
 
 import net.shibboleth.idp.attribute.context.AttributeContext;
-import net.shibboleth.idp.cas.proxy.ProxyAuthenticator;
 import net.shibboleth.idp.cas.ticket.ServiceTicket;
 import net.shibboleth.idp.cas.ticket.TicketService;
 import net.shibboleth.idp.cas.ticket.TicketState;
@@ -36,8 +34,6 @@ import net.shibboleth.idp.test.flows.AbstractFlowTest;
 
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 import org.opensaml.profile.context.ProfileRequestContext;
-import org.opensaml.security.trust.TrustEngine;
-import org.opensaml.security.x509.X509Credential;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.test.context.ContextConfiguration;
@@ -45,9 +41,6 @@ import org.springframework.webflow.execution.FlowExecutionOutcome;
 import org.springframework.webflow.executor.FlowExecutionResult;
 import org.testng.annotations.Test;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
 import static org.testng.Assert.*;
 
 /**
@@ -319,13 +312,4 @@ public class ServiceValidateFlowTest extends AbstractFlowTest {
         assertFalse(ac.getUnfilteredIdPAttributes().isEmpty());
     }
 
-    @SuppressWarnings("unused")
-    private static ProxyAuthenticator<TrustEngine<X509Credential>> mockProxyAuthenticator(final Exception toBeThrown)
-            throws Exception {
-        final ProxyAuthenticator<TrustEngine<X509Credential>> authenticator = mock(ProxyAuthenticator.class);
-        if (toBeThrown != null) {
-            doThrow(toBeThrown).when(authenticator).authenticate(any(URI.class), any(TrustEngine.class));
-        }
-        return authenticator;
-    }
-}
+}
\ No newline at end of file

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