Roll back previous change, not going to work.

[shibboleth/cpp-opensaml.git] / saml / binding / MessageDecoder.h

diff --git a/saml/binding/MessageDecoder.h b/saml/binding/MessageDecoder.h
index 837eca0..bbe176e 100644 (file)
--- a/saml/binding/MessageDecoder.h
+++ b/saml/binding/MessageDecoder.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2009 Internet2
+ *  Copyright 2001-2010 Internet2
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,7 +58,14 @@ namespace opensaml {
     {
         MAKE_NONCOPYABLE(MessageDecoder);
     public:
-        virtual ~MessageDecoder() {}
+        virtual ~MessageDecoder();
+
+        /**
+         * Returns identifier for the protocol family associated with the decoder.
+         *
+         * @return  a protocol family identifier, or nullptr
+         */
+        virtual const XMLCh* getProtocolFamily() const;
 
         /**
          * Indicates whether a web browser or similar user agent delivered the message.
@@ -81,10 +88,10 @@ namespace opensaml {
         class SAML_API ArtifactResolver {
             MAKE_NONCOPYABLE(ArtifactResolver);
         protected:
-            ArtifactResolver() {}
+            ArtifactResolver();
 
         public:
-            virtual ~ArtifactResolver() {}
+            virtual ~ArtifactResolver();
 
             /**
              * Resolves one or more SAML 1.x artifacts into a response containing a set of
@@ -112,7 +119,7 @@ namespace opensaml {
              * @param artifact          reference to a SAML 2.0 artifact
              * @param ssoDescriptor     reference to SSO role of artifact issuer (may be SP or IdP)
              * @param policy            reference to policy containing rules, MetadataProvider, TrustEngine, etc.
-             * @return the corresponding SAML protocol message or NULL
+             * @return the corresponding SAML protocol message or nullptr
              */
             virtual saml2p::ArtifactResponse* resolve(
                 const saml2p::SAML2Artifact& artifact,
@@ -136,14 +143,12 @@ namespace opensaml {
          *
          * @param artifactResolver   an ArtifactResolver implementation to use
          */
-        void setArtifactResolver(const ArtifactResolver* artifactResolver) {
-            m_artifactResolver = artifactResolver;
-        }
+        void setArtifactResolver(const ArtifactResolver* artifactResolver);
 
         /**
          * Decodes a transport request into a SAML protocol message, and evaluates it
          * against a supplied SecurityPolicy. If the transport request does not contain
-         * the information necessary to decode the request, NULL will be returned.
+         * the information necessary to decode the request, nullptr will be returned.
          * Errors during the decoding process will be raised as exceptions.
          *
          * <p>Artifact-based bindings require an ArtifactResolver be set to
@@ -152,7 +157,7 @@ namespace opensaml {
          * @param relayState        will be set to RelayState/TARGET value accompanying message
          * @param genericRequest    reference to interface for accessing transport request to decode
          * @param policy            reference to policy containing rules, MetadataProvider, TrustEngine, etc.
-         * @return  the decoded message, or NULL if the decoder did not recognize the request content
+         * @return  the decoded message, or nullptr if the decoder did not recognize the request content
          */
         virtual xmltooling::XMLObject* decode(
             std::string& relayState,
@@ -161,7 +166,7 @@ namespace opensaml {
             ) const=0;
 
     protected:
-        MessageDecoder() : m_artifactResolver(NULL) {}
+        MessageDecoder();
 
         /** Pointer to an ArtifactResolver implementation. */
         const ArtifactResolver* m_artifactResolver;