[opensaml2] 08/11: SSPCPP-756 Remove deprecated methods index(...)

[Etienne Dysli Metref]

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

edm-guest pushed a commit to branch master
in repository opensaml2.

commit 1371e6ef0a738d74e1d482cf8a7e37e7a6176a5d
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date:   Sun Nov 5 15:52:39 2017 +0000

    SSPCPP-756 Remove deprecated methods index(...)
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-756
---
 saml/saml2/metadata/AbstractMetadataProvider.h      | 21 ---------------------
 .../metadata/impl/AbstractMetadataProvider.cpp      | 10 ----------
 saml/saml2/metadata/impl/XMLMetadataProvider.cpp    |  1 -
 3 files changed, 32 deletions(-)

diff --git a/saml/saml2/metadata/AbstractMetadataProvider.h b/saml/saml2/metadata/AbstractMetadataProvider.h
index 211c082..d865435 100644
--- a/saml/saml2/metadata/AbstractMetadataProvider.h
+++ b/saml/saml2/metadata/AbstractMetadataProvider.h
@@ -120,27 +120,6 @@ namespace opensaml {
             virtual void indexGroup(EntitiesDescriptor* group, time_t& validUntil) const;
 
             /**
-             * @deprecated
-             * Loads an entity into the cache for faster lookup.
-             * <p>This includes processing known reverse lookup strategies for artifacts.
-             * This method will *not* free any objects removed from the cache.</p>
-             * 
-             * @param site          entity definition
-             * @param validUntil    maximum expiration time of the entity definition
-             * @param replace       true iff existing entries for the same entity should be cleared/replaced
-             */
-            virtual void index(EntityDescriptor* site, time_t validUntil, bool replace=false) const;
-
-            /**
-             * @deprecated
-             * Loads a group of entities into the cache for faster lookup.
-             * 
-             * @param group         group definition
-             * @param validUntil    maximum expiration time of the group definition
-             */
-            virtual void index(EntitiesDescriptor* group, time_t validUntil) const;
-
-            /**
             * Clear a specific entity from the cache.
             *
             * @param entityID the ID of the entity to remove
diff --git a/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp b/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
index 071933c..46c40bf 100644
--- a/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
@@ -209,16 +209,6 @@ void AbstractMetadataProvider::indexGroup(EntitiesDescriptor* group, time_t& val
         validUntil = minValidUntil;
 }
 
-void AbstractMetadataProvider::index(EntityDescriptor* site, time_t validUntil, bool replace) const
-{
-    indexEntity(site, validUntil, replace);
-}
-
-void AbstractMetadataProvider::index(EntitiesDescriptor* group, time_t validUntil) const
-{
-    indexGroup(group, validUntil);
-}
-
 void AbstractMetadataProvider::unindex(const XMLCh* entityID, bool freeSites) const
 {
     auto_ptr_char id(entityID);
diff --git a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
index 460dcc8..4a0edd3 100644
--- a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
@@ -88,7 +88,6 @@ namespace opensaml {
             pair<bool,DOMElement*> background_load();
 
         private:
-            using AbstractMetadataProvider::index;
             void index(time_t& validUntil);
             time_t computeNextRefresh();
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/opensaml2.git