Merge pull request #4438 from elpaso/server-class-split

[server] Moved QgsBufferServerRequest into its own header and cpp file
qgis · Apr 29, 2017 · da39cd9 · da39cd9
2 parents b3e1aba + 76d8650
commit da39cd9
Show file tree

Hide file tree

Showing 11 changed files with 391 additions and 303 deletions.
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
@@ -48,7 +48,9 @@ SET(qgis_mapserv_SRCS
   qgsserverrequest.cpp
   qgsserverresponse.cpp
   qgsfcgiserverresponse.cpp
+  qgsfcgiserverrequest.cpp
   qgsbufferserverresponse.cpp
+  qgsbufferserverrequest.cpp
   qgsfilterresponsedecorator.cpp
   qgsserverinterface.cpp
   qgsserverinterfaceimpl.cpp

diff --git a/src/server/qgis_map_serv.cpp b/src/server/qgis_map_serv.cpp
@@ -20,6 +20,7 @@
 #include "qgsconfig.h"
 #include "qgsserver.h"
 #include "qgsfcgiserverresponse.h"
+#include "qgsfcgiserverrequest.h"
 
 #include <fcgi_stdio.h>
 #include <cstdlib>

diff --git a/src/server/qgsbufferserverrequest.cpp b/src/server/qgsbufferserverrequest.cpp
@@ -0,0 +1,47 @@
+/***************************************************************************
+                          qgsbufferserverrequest.cpp
+
+  Define response wrapper for bbuffer response
+  -------------------
+  begin                : 2017-01-03
+  copyright            : (C) 2017 by David Marteau
+  email                : david dot marteau at 3liz dot com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "qgsbufferserverrequest.h"
+#include "qgslogger.h"
+#include "qgsmessagelog.h"
+
+#include <QDebug>
+
+QgsBufferServerRequest::QgsBufferServerRequest( const QString &url, Method method, QByteArray *data )
+  : QgsServerRequest( url, method )
+{
+  if ( data )
+  {
+    mData = *data;
+  }
+}
+
+QgsBufferServerRequest::QgsBufferServerRequest( const QUrl &url, Method method, QByteArray *data )
+  : QgsServerRequest( url, method )
+{
+  if ( data )
+  {
+    mData = *data;
+  }
+}
+
+QgsBufferServerRequest::~QgsBufferServerRequest()
+{
+
+}
diff --git a/src/server/qgsbufferserverrequest.h b/src/server/qgsbufferserverrequest.h
@@ -0,0 +1,61 @@
+/***************************************************************************
+                          qgsbufferserverrequest.h
+
+  Define response wrapper for storing responsea in buffer
+  -------------------
+  begin                : 2017-01-03
+  copyright            : (C) 2017 by David Marteau
+  email                : david dot marteau at 3liz dot com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#ifndef QGSBUFFERSERVERREQUEST_H
+#define QGSBUFFERSERVERREQUEST_H
+
+#include "qgsserverrequest.h"
+
+#include <QBuffer>
+#include <QByteArray>
+#include <QMap>
+
+/**
+ * \ingroup server
+ * QgsBufferServerRequest
+ * Class defining request with  data
+ */
+class QgsBufferServerRequest : public QgsServerRequest
+{
+  public:
+
+    /**
+    * Constructor
+    *
+    * \param url the url string
+    * \param method the request method
+    */
+    QgsBufferServerRequest( const QString &url, Method method = GetMethod, QByteArray *data = nullptr );
+
+    /**
+     * Constructor
+     *
+     * \param url QUrl
+     * \param method the request method
+     */
+    QgsBufferServerRequest( const QUrl &url, Method method = GetMethod, QByteArray *data = nullptr );
+
+    ~QgsBufferServerRequest();
+
+    virtual QByteArray data() const { return mData; }
+
+  private:
+    QByteArray mData;
+};
+
+#endif
diff --git a/src/server/qgsbufferserverresponse.cpp b/src/server/qgsbufferserverresponse.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
-                          qgsfcgiserverresponse.cpp
+                          qgsbufferserverresponse.cpp
 
-  Define response wrapper for fcgi response
+  Define response wrapper for buffer response
   -------------------
   begin                : 2017-01-03
   copyright            : (C) 2017 by David Marteau
@@ -141,30 +141,3 @@ void QgsBufferServerResponse::truncate()
   mBuffer.seek( 0 );
   mBuffer.buffer().clear();
 }
-
-//QgsBufferServerRequest
-//
-QgsBufferServerRequest::QgsBufferServerRequest( const QString &url, Method method, QByteArray *data )
-  : QgsServerRequest( url, method )
-{
-  if ( data )
-  {
-    mData = *data;
-  }
-}
-
-QgsBufferServerRequest::QgsBufferServerRequest( const QUrl &url, Method method, QByteArray *data )
-  : QgsServerRequest( url, method )
-{
-  if ( data )
-  {
-    mData = *data;
-  }
-}
-
-QgsBufferServerRequest::~QgsBufferServerRequest()
-{
-}
-
-
-
diff --git a/src/server/qgsbufferserverresponse.h b/src/server/qgsbufferserverresponse.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          qgsfcgiserverresponse.h
+                          qgsbufferserverresponse.h
 
   Define response wrapper for storing responsea in buffer
   -------------------
@@ -20,7 +20,6 @@
 #define QGSBUFFERSERVERRESPONSE_H
 
 #include "qgsserverresponse.h"
-#include "qgsserverrequest.h"
 
 #include <QBuffer>
 #include <QByteArray>
@@ -86,42 +85,4 @@ class QgsBufferServerResponse: public QgsServerResponse
     int                    mReturnCode = 200;
 };
 
-/**
- * \ingroup server
- * QgsBufferServerRequest
- * Class defining request with  data
- */
-class QgsBufferServerRequest : public QgsServerRequest
-{
-  public:
-
-    /**
-    * Constructor
-    *
-    * \param url the url string
-    * \param method the request method
-    */
-    QgsBufferServerRequest( const QString &url, Method method = GetMethod, QByteArray *data = nullptr );
-
-    /**
-     * Constructor
-     *
-     * \param url QUrl
-     * \param method the request method
-     */
-    QgsBufferServerRequest( const QUrl &url, Method method = GetMethod, QByteArray *data = nullptr );
-
-    ~QgsBufferServerRequest();
-
-    virtual QByteArray data() const { return mData; }
-
-  private:
-    QByteArray mData;
-};
-
 #endif
-
-
-
-
-