[Server] remove QgsWfsProjectParser

qgis · Apr 8, 2017 · d018f03 · d018f03
1 parent eb3af08
commit d018f03
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 819 deletions.
diff --git a/python/server/qgsconfigcache.sip b/python/server/qgsconfigcache.sip
@@ -32,7 +32,6 @@ class QgsConfigCache: QObject
     ~QgsConfigCache();
 
     QgsServerProjectParser* serverConfiguration( const QString& filePath );
-    QgsWfsProjectParser* wfsConfiguration( const QString& filePath, const QgsAccessControl* accessControl );
     QgsWmsConfigParser* wmsConfiguration( const QString& filePath, const QgsAccessControl* accessControl, const QMap<QString, QString>& parameterMap = QMap< QString, QString >() );
 
   private:

diff --git a/python/server/qgswfserver.sip b/python/server/qgswfserver.sip
diff --git a/python/server/server.sip b/python/server/server.sip
@@ -23,7 +23,6 @@
 %Include qgsserverprojectparser.sip
 %Include qgswmsconfigparser.sip
 %Include qgswmsprojectparser.sip
-%Include qgswfsprojectparser.sip
 %Include qgsconfigcache.sip
 %Include qgsserversettings.sip
 %Include qgsserverprojectutils.sip

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
@@ -34,7 +34,6 @@ SET(qgis_mapserv_SRCS
   qgsremotedatasourcebuilder.cpp
   qgssentdatasourcebuilder.cpp
   qgsserverlogger.cpp
-  qgswfsprojectparser.cpp
   qgswmsconfigparser.cpp
   qgswmsprojectparser.cpp
   qgsserverprojectparser.cpp

diff --git a/src/server/qgsconfigcache.cpp b/src/server/qgsconfigcache.cpp
@@ -18,7 +18,6 @@
 #include "qgsconfigcache.h"
 #include "qgsmessagelog.h"
 #include "qgsmslayercache.h"
-#include "qgswfsprojectparser.h"
 #include "qgswmsprojectparser.h"
 #include "qgssldconfigparser.h"
 #include "qgsaccesscontrol.h"
@@ -76,32 +75,6 @@ QgsServerProjectParser *QgsConfigCache::serverConfiguration( const QString &file
   return new QgsServerProjectParser( doc, filePath );
 }
 
-QgsWfsProjectParser *QgsConfigCache::wfsConfiguration(
-  const QString &filePath
-  , const QgsAccessControl *accessControl
-)
-{
-  QgsWfsProjectParser *p = mWFSConfigCache.object( filePath );
-  if ( !p )
-  {
-    QDomDocument *doc = xmlDocument( filePath );
-    if ( !doc )
-    {
-      return nullptr;
-    }
-    p = new QgsWfsProjectParser(
-      filePath
-      , accessControl
-    );
-    mWFSConfigCache.insert( filePath, p );
-    p = mWFSConfigCache.object( filePath );
-    Q_ASSERT( p );
-  }
-
-  QgsMSLayerCache::instance()->setProjectMaxLayers( p->wfsLayers().size() );
-  return p;
-}
-
 QgsWmsConfigParser *QgsConfigCache::wmsConfiguration(
   const QString &filePath
   , const QgsAccessControl *accessControl
@@ -182,7 +155,6 @@ QDomDocument *QgsConfigCache::xmlDocument( const QString &filePath )
 void QgsConfigCache::removeChangedEntry( const QString &path )
 {
   mWMSConfigCache.remove( path );
-  mWFSConfigCache.remove( path );
 
   //xml document must be removed last, as other config cache destructors may require it
   mXmlDocumentCache.remove( path );

diff --git a/src/server/qgsconfigcache.h b/src/server/qgsconfigcache.h
@@ -27,7 +27,6 @@
 
 #include "qgis_server.h"
 #include "qgswmsconfigparser.h"
-#include "qgswfsprojectparser.h"
 
 class QgsServerProjectParser;
 class QgsAccessControl;
@@ -41,10 +40,6 @@ class SERVER_EXPORT QgsConfigCache : public QObject
     static QgsConfigCache *instance();
 
     QgsServerProjectParser *serverConfiguration( const QString &filePath );
-    QgsWfsProjectParser *wfsConfiguration(
-      const QString &filePath
-      , const QgsAccessControl *accessControl
-    );
     QgsWmsConfigParser *wmsConfiguration(
       const QString &filePath
       , const QgsAccessControl *accessControl
@@ -64,7 +59,6 @@ class SERVER_EXPORT QgsConfigCache : public QObject
 
     QCache<QString, QDomDocument> mXmlDocumentCache;
     QCache<QString, QgsWmsConfigParser> mWMSConfigCache;
-    QCache<QString, QgsWfsProjectParser> mWFSConfigCache;
 
   private slots:
     //! Removes changed entry from this cache