[cpp-sp] branch master updated: Remove another deprecated method.

[Scott Cantor]

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

scantor pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=f288a62c46a2170c1123e2e77d93f988b5b3ae53

The following commit(s) were added to refs/heads/master by this push:
       new  f288a62   Remove another deprecated method.
f288a62 is described below

commit f288a62c46a2170c1123e2e77d93f988b5b3ae53
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Apr 23 15:47:14 2018 -0400

    Remove another deprecated method.
---
 shibsp/handler/AssertionConsumerService.h        | 23 --------------------
 shibsp/handler/impl/AssertionConsumerService.cpp | 27 ------------------------
 util/resolvertest.cpp                            |  2 +-
 3 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/shibsp/handler/AssertionConsumerService.h b/shibsp/handler/AssertionConsumerService.h
index 97abda9..b9b1261 100644
--- a/shibsp/handler/AssertionConsumerService.h
+++ b/shibsp/handler/AssertionConsumerService.h
@@ -137,29 +137,6 @@ namespace shibsp {
             ) const;
 
         /**
-         * Implement protocol-specific handling of the incoming decoded message.
-         * 
-         * <p>The result of implementing the protocol should be an exception or
-         * modifications to the request/response objects to reflect processing
-         * of the message.
-         * 
-         * @param application   reference to application receiving message
-         * @param httpRequest   client request that included message
-         * @param httpResponse  response to client
-         * @param policy        the SecurityPolicy in effect, after having evaluated the message
-         * @param reserved      ignore this parameter
-         * @param xmlObject     a protocol-specific message object
-         */
-        virtual void implementProtocol(
-            const Application& application,
-            const xmltooling::HTTPRequest& httpRequest,
-            xmltooling::HTTPResponse& httpResponse,
-            opensaml::SecurityPolicy& policy,
-            const PropertySet* reserved,
-            const xmltooling::XMLObject& xmlObject
-            ) const=0;
-
-        /**
          * Extracts policy-relevant assertion details.
          * 
          * @param assertion the incoming assertion
diff --git a/shibsp/handler/impl/AssertionConsumerService.cpp b/shibsp/handler/impl/AssertionConsumerService.cpp
index 4d54d8c..476e378 100644
--- a/shibsp/handler/impl/AssertionConsumerService.cpp
+++ b/shibsp/handler/impl/AssertionConsumerService.cpp
@@ -417,33 +417,6 @@ vector<Assertion*> DummyContext::m_tokens;
 
 ResolutionContext* AssertionConsumerService::resolveAttributes(
     const Application& application,
-    const saml2md::RoleDescriptor* issuer,
-    const XMLCh* protocol,
-    const saml1::NameIdentifier* v1nameid,
-    const saml2::NameID* nameid,
-    const XMLCh* authncontext_class,
-    const XMLCh* authncontext_decl,
-    const vector<const Assertion*>* tokens
-    ) const
-{
-    return resolveAttributes(
-        application,
-        nullptr,
-        issuer,
-        protocol,
-        nullptr,
-        v1nameid,
-        nullptr,
-        nameid,
-        nullptr,
-        authncontext_class,
-        authncontext_decl,
-        tokens
-        );
-}
-
-ResolutionContext* AssertionConsumerService::resolveAttributes(
-    const Application& application,
     const GenericRequest* request,
     const RoleDescriptor* issuer,
     const XMLCh* protocol,
diff --git a/util/resolvertest.cpp b/util/resolvertest.cpp
index ae04858..de8e318 100644
--- a/util/resolvertest.cpp
+++ b/util/resolvertest.cpp
@@ -88,7 +88,7 @@ public:
         const vector<const Assertion*>* tokens
         ) const {
         return shibsp::AssertionConsumerService::resolveAttributes(
-            application, issuer, protocol, v1nameid, nameid, authncontext_class, authncontext_decl, tokens
+            application, nullptr, issuer, protocol, nullptr, v1nameid, nullptr, nameid, nullptr, authncontext_class, authncontext_decl, tokens
             );
     }
 

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