Introduce QHttpServerRouter

Provide simple API for routing, parsing, capture and call callback

Change-Id: Ibd7c37282d00bd56f96d841db92b473a65a2bf5c
Reviewed-by: Edward Welbourne <[email protected]>
Reviewed-by: Paul Wicking <[email protected]>
Reviewed-by: Jesus Fernandez <[email protected]>

src/httpserver/httpserver.pro

@@ -9,15 +9,23 @@ HEADERS += \
  qthttpserverglobal.h \
  qabstracthttpserver.h \
  qabstracthttpserver_p.h \
+ qhttpserverhelpers.h \
+ qhttpserverrequest.h \
+ qhttpserverrequest_p.h \
  qhttpserverresponder.h \
  qhttpserverresponder_p.h \
- qhttpserverrequest.h \
- qhttpserverrequest_p.h
+ qhttpserverrouter.h \
+ qhttpserverrouter_p.h \
+ qhttpserverrouterrule.h \
+ qhttpserverrouterrule_p.h \
+ qhttpserverrouterviewtraits.h
 
 SOURCES += \
  qabstracthttpserver.cpp \
+ qhttpserverrequest.cpp \
  qhttpserverresponder.cpp \
- qhttpserverrequest.cpp
+ qhttpserverrouter.cpp \
+ qhttpserverrouterrule.cpp
 
 include(../3rdparty/http-parser.pri)
 

src/httpserver/qhttpserverhelpers.h

@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtHttpServer module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QHTTPSERVERHELPERS_H
+#define QHTTPSERVERHELPERS_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists for the convenience
+// of QHttpServer. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+
+#include <QtCore/qglobal.h>
+
+#include <functional>
+
+QT_BEGIN_NAMESPACE
+
+namespace QHttpServerHelpers {
+
+template<int> struct Placeholder {};
+
+} // namespace QHttpServerHelpers
+
+namespace std {
+
+template<int N>
+struct is_placeholder<QHttpServerHelpers::Placeholder<N>> : integral_constant<int, N + 1> {};
+
+} // namespace std
+
+QT_END_NAMESPACE
+
+#endif // QHTTPSERVERHELPERS_H

src/httpserver/qhttpserverrequest.h

@@ -59,21 +59,24 @@ class Q_HTTPSERVER_EXPORT QHttpServerRequest : public QObjectUserData
  friend class QAbstractHttpServerPrivate;
  friend class QHttpServerResponse;
 
+ Q_GADGET
+
 public:
  ~QHttpServerRequest() override;
 
  enum class Method
  {
- Unknown = -1,
-
- Get,
- Put,
- Delete,
- Post,
- Head,
- Options,
- Patch
+ Unknown = 0x0000,
+ Get = 0x0001,
+ Put = 0x0002,
+ Delete = 0x0004,
+ Post = 0x0008,
+ Head = 0x0010,
+ Options = 0x0020,
+ Patch = 0x0040
  };
+ Q_DECLARE_FLAGS(Methods, Method);
+ Q_FLAG(Methods)
 
  QString value(const QString &key) const;
  QUrl url() const;
@@ -96,6 +99,4 @@ class Q_HTTPSERVER_EXPORT QHttpServerRequest : public QObjectUserData
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QHttpServerRequest::Method)
-
 #endif // QHTTPSERVERREQUEST_H