.github/workflows/cpp.yml

@@ -17,25 +17,5 @@ jobs:
       - name: Install dos2unix
         run: sudo apt-get install -y dos2unix
 
-      - name: Install clang-format-17
-        run: |
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x ./llvm.sh
-          sudo ./llvm.sh 17
-          sudo apt-get install -y clang-format-17
-
       - name: Check formatting
         run: ./format.sh && git diff --exit-code
-        env:
-          CLANG_FORMAT: clang-format-17
-
-  cpplint:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install cpplint
-        run: pip install cpplint
-
-      - name: Run lint
-        run: cpplint --recursive .

CPPLINT.cfg

@@ -1,41 +0,0 @@
-# Stop searching for additional config files.
-set noparent
-
-exclude_files=trantor
-exclude_files=build
-
-# Use non-const reference rather than a pointer.
-filter=-runtime/references
-
-# CHECK macros are from Drogon, not Google Test.
-filter=-readability/check
-
-# Don't warn about the use of C++11 features.
-filter=-build/c++11
-
-filter=-build/include_subdir
-
-# We prioritize clang-format for now.
-filter=-whitespace
-
-# We don't require a username in TODO comments.
-filter=-readability/todo
-
-# TODO: Fix these.
-filter=-legal/copyright
-filter=-build/storage_class
-filter=-build/namespaces
-filter=-build/include
-filter=-build/header_guard
-filter=-build/include_what_you_use
-filter=-build/include_order
-filter=-build/explicit_make_pair
-filter=-runtime/explicit
-filter=-runtime/string
-filter=-runtime/int
-filter=-readability/multiline_string
-filter=-readability/inheritance
-filter=-readability/casting
-filter=-readability/braces
-filter=-readability/fn_size
-filter=-runtime/threadsafe_fn

drogon_ctl/create_model.cc

@@ -308,18 +308,16 @@ void create_model::createModelClassFromPG(
     data["hasPrimaryKey"] = (int)pkNumber;
     if (pkNumber == 1)
     {
-        *client << "SELECT "
+        *client << "SELECT \
-                   "pg_attribute.attname AS colname,"
+                pg_attribute.attname AS colname,\
-                   "pg_type.typname AS typename,"
+                pg_type.typname AS typename,\
-                   "pg_constraint.contype AS contype "
+                pg_constraint.contype AS contype \
-                   "FROM pg_constraint "
+                FROM pg_constraint \
-                   "INNER JOIN pg_class ON pg_constraint.conrelid = "
+                INNER JOIN pg_class ON pg_constraint.conrelid = pg_class.oid \
-                   "pg_class.oid "
+                INNER JOIN pg_attribute ON pg_attribute.attrelid = pg_class.oid \
-                   "INNER JOIN pg_attribute ON pg_attribute.attrelid = "
+                AND pg_attribute.attnum = pg_constraint.conkey [ 1 ] \
-                   "pg_class.oid "
+                INNER JOIN pg_type ON pg_type.oid = pg_attribute.atttypid \
-                   "AND pg_attribute.attnum = pg_constraint.conkey [ 1 ] "
+                WHERE pg_class.relname = $1 and pg_constraint.contype='p'"
-                   "INNER JOIN pg_type ON pg_type.oid = pg_attribute.atttypid "
-                   "WHERE pg_class.relname = $1 and pg_constraint.contype='p'"
                 << tableName << Mode::Blocking >>
             [&](bool isNull,
                 const std::string &colName,
@@ -347,20 +345,16 @@ void create_model::createModelClassFromPG(
         std::vector<std::string> pkNames, pkTypes, pkValNames;
         for (size_t i = 1; i <= pkNumber; ++i)
         {
-            *client << "SELECT "
+            *client << "SELECT \
-                       "pg_attribute.attname AS colname,"
+                pg_attribute.attname AS colname,\
-                       "pg_type.typname AS typename,"
+                pg_type.typname AS typename,\
-                       "pg_constraint.contype AS contype "
+                pg_constraint.contype AS contype \
-                       "FROM pg_constraint "
+                FROM pg_constraint \
-                       "INNER JOIN pg_class ON pg_constraint.conrelid = "
+                INNER JOIN pg_class ON pg_constraint.conrelid = pg_class.oid \
-                       "pg_class.oid "
+                INNER JOIN pg_attribute ON pg_attribute.attrelid = pg_class.oid \
-                       "INNER JOIN pg_attribute ON pg_attribute.attrelid = "
+                AND pg_attribute.attnum = pg_constraint.conkey [ $1 ] \
-                       "pg_class.oid "
+                INNER JOIN pg_type ON pg_type.oid = pg_attribute.atttypid \
-                       "AND pg_attribute.attnum = pg_constraint.conkey [ $1 ] "
+                WHERE pg_class.relname = $2 and pg_constraint.contype='p'"
-                       "INNER JOIN pg_type ON pg_type.oid = "
-                       "pg_attribute.atttypid "
-                       "WHERE pg_class.relname = $2 and "
-                       "pg_constraint.contype='p'"
                     << (int)i << tableName << Mode::Blocking >>
                 [&](bool isNull, std::string colName, const std::string &type) {
                     if (isNull)

format.sh

@@ -3,10 +3,10 @@
 # You can customize the clang-format path by setting the CLANG_FORMAT environment variable
 CLANG_FORMAT=${CLANG_FORMAT:-clang-format}
 
-# Check if clang-format version is 17 to avoid inconsistent formatting
+# Check if clang-format version is 14 to avoid inconsistent formatting
 $CLANG_FORMAT --version
-if [[ ! $($CLANG_FORMAT --version) =~ "version 17" ]]; then
+if [[ ! $($CLANG_FORMAT --version) =~ "version 14" ]]; then
-    echo "Error: clang-format version must be 17"
+    echo "Error: clang-format version must be 14"
     exit 1
 fi
 

lib/inc/drogon/DrClassMap.h

@@ -138,7 +138,7 @@ class DROGON_EXPORT DrClassMap
 
   protected:
     static std::unordered_map<std::string,
-                              std::pair<DrAllocFunc, DrSharedAllocFunc>> &
+                              std::pair<DrAllocFunc, DrSharedAllocFunc>>
-    getMap();
+        &getMap();
 };
 }  // namespace drogon

lib/inc/drogon/HttpAppFramework.h

@@ -194,8 +194,8 @@ class DROGON_EXPORT HttpAppFramework : public trantor::NonCopyable
      * returned.
      */
     virtual const std::function<HttpResponsePtr(HttpStatusCode,
-                                                const HttpRequestPtr &req)> &
+                                                const HttpRequestPtr &req)>
-    getCustomErrorHandler() const = 0;
+        &getCustomErrorHandler() const = 0;
 
     /// Get the plugin object registered in the framework
     /**
@@ -1421,8 +1421,8 @@ class DROGON_EXPORT HttpAppFramework : public trantor::NonCopyable
      *
      * @return std::pair<size_t, std::string>
      */
-    virtual const std::pair<unsigned int, std::string> &
+    virtual const std::pair<unsigned int, std::string>
-    getFloatPrecisionInJson() const noexcept = 0;
+        &getFloatPrecisionInJson() const noexcept = 0;
     /// Create a database client
     /**
      * @param dbType The database type is one of

lib/inc/drogon/HttpRequest.h

@@ -162,31 +162,27 @@ class DROGON_EXPORT HttpRequest
     virtual const std::string &getCookie(const std::string &field) const = 0;
 
     /// Get all headers of the request
-    virtual const std::unordered_map<std::string,
+    virtual const std::
-                                     std::string,
+        unordered_map<std::string, std::string, utils::internal::SafeStringHash>
-                                     utils::internal::SafeStringHash> &
+            &headers() const = 0;
-    headers() const = 0;
 
     /// Get all headers of the request
-    const std::unordered_map<std::string,
+    const std::
-                             std::string,
+        unordered_map<std::string, std::string, utils::internal::SafeStringHash>
-                             utils::internal::SafeStringHash> &
+            &getHeaders() const
-    getHeaders() const
     {
         return headers();
     }
 
     /// Get all cookies of the request
-    virtual const std::unordered_map<std::string,
+    virtual const std::
-                                     std::string,
+        unordered_map<std::string, std::string, utils::internal::SafeStringHash>
-                                     utils::internal::SafeStringHash> &
+            &cookies() const = 0;
-    cookies() const = 0;
 
     /// Get all cookies of the request
-    const std::unordered_map<std::string,
+    const std::
-                             std::string,
+        unordered_map<std::string, std::string, utils::internal::SafeStringHash>
-                             utils::internal::SafeStringHash> &
+            &getCookies() const
-    getCookies() const
     {
         return cookies();
     }
@@ -304,16 +300,14 @@ class DROGON_EXPORT HttpRequest
     }
 
     /// Get parameters of the request.
-    virtual const std::unordered_map<std::string,
+    virtual const std::
-                                     std::string,
+        unordered_map<std::string, std::string, utils::internal::SafeStringHash>
-                                     utils::internal::SafeStringHash> &
+            &parameters() const = 0;
-    parameters() const = 0;
 
     /// Get parameters of the request.
-    const std::unordered_map<std::string,
+    const std::
-                             std::string,
+        unordered_map<std::string, std::string, utils::internal::SafeStringHash>
-                             utils::internal::SafeStringHash> &
+            &getParameters() const
-    getParameters() const
     {
         return parameters();
     }

lib/inc/drogon/HttpResponse.h

@@ -244,16 +244,14 @@ class DROGON_EXPORT HttpResponse
     virtual void removeHeader(std::string key) = 0;
 
     /// Get all headers of the response
-    virtual const std::unordered_map<std::string,
+    virtual const std::
-                                     std::string,
+        unordered_map<std::string, std::string, utils::internal::SafeStringHash>
-                                     utils::internal::SafeStringHash> &
+            &headers() const = 0;
-    headers() const = 0;
 
     /// Get all headers of the response
-    const std::unordered_map<std::string,
+    const std::
-                             std::string,
+        unordered_map<std::string, std::string, utils::internal::SafeStringHash>
-                             utils::internal::SafeStringHash> &
+            &getHeaders() const
-    getHeaders() const
     {
         return headers();
     }
@@ -282,13 +280,13 @@ class DROGON_EXPORT HttpResponse
 
     /// Get all cookies.
     virtual const std::
-        unordered_map<std::string, Cookie, utils::internal::SafeStringHash> &
+        unordered_map<std::string, Cookie, utils::internal::SafeStringHash>
-        cookies() const = 0;
+            &cookies() const = 0;
 
     /// Get all cookies.
     const std::
-        unordered_map<std::string, Cookie, utils::internal::SafeStringHash> &
+        unordered_map<std::string, Cookie, utils::internal::SafeStringHash>
-        getCookies() const
+            &getCookies() const
     {
         return cookies();
     }
@@ -582,8 +580,8 @@ class DROGON_EXPORT HttpResponse
      * newStreamResponse) returns the callback function. Otherwise a
      * null function.
      */
-    virtual const std::function<std::size_t(char *, std::size_t)> &
+    virtual const std::function<std::size_t(char *, std::size_t)>
-    streamCallback() const = 0;
+        &streamCallback() const = 0;
 
     /**
      * @brief If the response is a async stream response (i.e. created by

lib/src/DrClassMap.cc

@@ -22,8 +22,8 @@ namespace drogon
 {
 namespace internal
 {
-static std::unordered_map<std::string, std::shared_ptr<DrObjectBase>> &
+static std::unordered_map<std::string, std::shared_ptr<DrObjectBase>>
-getObjsMap()
+    &getObjsMap()
 {
     static std::unordered_map<std::string, std::shared_ptr<DrObjectBase>>
         singleInstanceMap;
@@ -112,8 +112,8 @@ std::vector<std::string> DrClassMap::getAllClassName()
     return ret;
 }
 
-std::unordered_map<std::string, std::pair<DrAllocFunc, DrSharedAllocFunc>> &
+std::unordered_map<std::string, std::pair<DrAllocFunc, DrSharedAllocFunc>>
-DrClassMap::getMap()
+    &DrClassMap::getMap()
 {
     static std::unordered_map<std::string,
                               std::pair<DrAllocFunc, DrSharedAllocFunc>>

lib/src/HttpAppFrameworkImpl.cc

@@ -1039,9 +1039,8 @@ HttpAppFramework &HttpAppFrameworkImpl::setCustomErrorHandler(
     return *this;
 }
 
-const std::function<HttpResponsePtr(HttpStatusCode,
+const std::function<HttpResponsePtr(HttpStatusCode, const HttpRequestPtr &req)>
-                                    const HttpRequestPtr &req)> &
+    &HttpAppFrameworkImpl::getCustomErrorHandler() const
-HttpAppFrameworkImpl::getCustomErrorHandler() const
 {
     return customErrorHandler_;
 }

lib/src/HttpAppFrameworkImpl.h

@@ -586,8 +586,8 @@ class HttpAppFrameworkImpl final : public HttpAppFramework
 
     bool areAllDbClientsAvailable() const noexcept override;
     const std::function<HttpResponsePtr(HttpStatusCode,
-                                        const HttpRequestPtr &req)> &
+                                        const HttpRequestPtr &req)>
-    getCustomErrorHandler() const override;
+        &getCustomErrorHandler() const override;
 
     bool isUsingCustomErrorHandler() const
     {

lib/src/HttpRequestImpl.h

@@ -169,10 +169,9 @@ class HttpRequestImpl : public HttpRequest
         pathEncode_ = pathEncode;
     }
 
-    const std::unordered_map<std::string,
+    const std::
-                             std::string,
+        unordered_map<std::string, std::string, utils::internal::SafeStringHash>
-                             utils::internal::SafeStringHash> &
+            &parameters() const override
-    parameters() const override
     {
         parseParametersOnce();
         return parameters_;
@@ -342,18 +341,16 @@ class HttpRequestImpl : public HttpRequest
         return defaultVal;
     }
 
-    const std::unordered_map<std::string,
+    const std::
-                             std::string,
+        unordered_map<std::string, std::string, utils::internal::SafeStringHash>
-                             utils::internal::SafeStringHash> &
+            &headers() const override
-    headers() const override
     {
         return headers_;
     }
 
-    const std::unordered_map<std::string,
+    const std::
-                             std::string,
+        unordered_map<std::string, std::string, utils::internal::SafeStringHash>
-                             utils::internal::SafeStringHash> &
+            &cookies() const override
-    cookies() const override
     {
         return cookies_;
     }

lib/src/HttpResponseImpl.h

@@ -133,10 +133,9 @@ class DROGON_EXPORT HttpResponseImpl : public HttpResponse
         removeHeaderBy(key);
     }
 
-    const std::unordered_map<std::string,
+    const std::
-                             std::string,
+        unordered_map<std::string, std::string, utils::internal::SafeStringHash>
-                             utils::internal::SafeStringHash> &
+            &headers() const override
-    headers() const override
     {
         return headers_;
     }
@@ -207,8 +206,8 @@ class DROGON_EXPORT HttpResponseImpl : public HttpResponse
     }
 
     const std::
-        unordered_map<std::string, Cookie, utils::internal::SafeStringHash> &
+        unordered_map<std::string, Cookie, utils::internal::SafeStringHash>
-        cookies() const override
+            &cookies() const override
     {
         return cookies_;
     }