Codebase modernization

RamseyK · RamseyK · commit 8cf005dd3d27 · 2025-01-03T22:02:49.000-05:00
diff --git a/src/ByteBuffer.h b/src/ByteBuffer.h
@@ -77,8 +77,8 @@ class ByteBuffer {
     }
 
 public:
-    ByteBuffer(unsigned int size = DEFAULT_SIZE);
-    ByteBuffer(const byte* arr, unsigned int size);
+    explicit ByteBuffer(unsigned int size = DEFAULT_SIZE);
+    explicit ByteBuffer(const byte* arr, unsigned int size);
     virtual ~ByteBuffer();
 
     unsigned int bytesRemaining() const; // Number of bytes from the current read position till the end of the buffer
diff --git a/src/HTTPMessage.cpp b/src/HTTPMessage.cpp
@@ -25,7 +25,7 @@ HTTPMessage::HTTPMessage(std::string const& sData) : ByteBuffer(sData.size() + 1
     putBytes((byte*)sData.c_str(), sData.size() + 1);
 }
 
-HTTPMessage::HTTPMessage(byte* pData, unsigned int len) : ByteBuffer(pData, len) {
+HTTPMessage::HTTPMessage(const byte* pData, unsigned int len) : ByteBuffer(pData, len) {
 }
 
 /**
diff --git a/src/HTTPMessage.h b/src/HTTPMessage.h
@@ -93,7 +93,7 @@ class HTTPMessage : public ByteBuffer {
 public:
     HTTPMessage();
     explicit HTTPMessage(std::string const& sData);
-    explicit HTTPMessage(byte *pData, unsigned int len);
+    explicit HTTPMessage(const byte *pData, unsigned int len);
     virtual ~HTTPMessage() = default;
 
     virtual byte* create() = 0;
@@ -124,7 +124,7 @@ class HTTPMessage : public ByteBuffer {
         return parseErrorStr;
     }
 
-    void setVersion(std::string v) {
+    void setVersion(std::string const& v) {
         version = v;
     }
 
diff --git a/src/HTTPRequest.cpp b/src/HTTPRequest.cpp
@@ -25,7 +25,7 @@ HTTPRequest::HTTPRequest() : HTTPMessage() {
 HTTPRequest::HTTPRequest(std::string const& sData) : HTTPMessage(sData) {
 }
 
-HTTPRequest::HTTPRequest(byte* pData, unsigned int len) : HTTPMessage(pData, len) {
+HTTPRequest::HTTPRequest(const byte* pData, unsigned int len) : HTTPMessage(pData, len) {
 }
 
 /**
diff --git a/src/HTTPRequest.h b/src/HTTPRequest.h
@@ -21,15 +21,15 @@
 
 #include "HTTPMessage.h"
 
-class HTTPRequest : public HTTPMessage {
+class HTTPRequest final : public HTTPMessage {
 private:
     int method = 0;
     std::string requestUri = "";
 
 public:
     HTTPRequest();
     explicit HTTPRequest(std::string const& sData);
-    explicit HTTPRequest(byte *pData, unsigned int len);
+    explicit HTTPRequest(const byte *pData, unsigned int len);
     ~HTTPRequest() = default;
 
     virtual byte *create();
diff --git a/src/HTTPResponse.cpp b/src/HTTPResponse.cpp
@@ -25,7 +25,7 @@ HTTPResponse::HTTPResponse() : HTTPMessage() {
 HTTPResponse::HTTPResponse(std::string const& sData) : HTTPMessage(sData) {
 }
 
-HTTPResponse::HTTPResponse(byte* pData, unsigned int len) : HTTPMessage(pData, len) {
+HTTPResponse::HTTPResponse(const byte* pData, unsigned int len) : HTTPMessage(pData, len) {
 }
 
 /**
diff --git a/src/HTTPResponse.h b/src/HTTPResponse.h
@@ -21,7 +21,7 @@
 
 #include "HTTPMessage.h"
 
-class HTTPResponse : public HTTPMessage {
+class HTTPResponse final : public HTTPMessage {
 private:
     // Response variables
     int status = 0;
@@ -33,7 +33,7 @@ class HTTPResponse : public HTTPMessage {
 public:
     HTTPResponse();
     explicit HTTPResponse(std::string const& sData);
-    explicit HTTPResponse(byte *pData, unsigned int len);
+    explicit HTTPResponse(const byte *pData, unsigned int len);
     ~HTTPResponse() = default;
 
     byte* create() final;
diff --git a/src/HTTPServer.cpp b/src/HTTPServer.cpp
@@ -662,7 +662,7 @@ ResourceHost* HTTPServer::getResourceHostForRequest(HTTPRequest* req) {
 
         // All vhosts have the port appended, so need to append it to the host if it doesnt exist
         if (!host.contains(":")) {
-            host.append(":" + std::to_string(listenPort));
+            host.append(std::format(":{}", listenPort));
         }
 
         std::unordered_map<std::string, ResourceHost*>::const_iterator it = vhosts.find(host);
diff --git a/src/ResourceHost.cpp b/src/ResourceHost.cpp
diff --git a/src/main.cpp b/src/main.cpp

Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,8 @@ class ByteBuffer {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`public:`
`80`		`- ByteBuffer(unsigned int size = DEFAULT_SIZE);`
`81`		`- ByteBuffer(const byte* arr, unsigned int size);`
	`80`	`+ explicit ByteBuffer(unsigned int size = DEFAULT_SIZE);`
	`81`	`+ explicit ByteBuffer(const byte* arr, unsigned int size);`
`82`	`82`	`virtual ~ByteBuffer();`
`83`	`83`
`84`	`84`	`unsigned int bytesRemaining() const; // Number of bytes from the current read position till the end of the buffer`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ HTTPMessage::HTTPMessage(std::string const& sData) : ByteBuffer(sData.size() + 1`
`25`	`25`	`putBytes((byte*)sData.c_str(), sData.size() + 1);`
`26`	`26`	`}`
`27`	`27`
`28`		`-HTTPMessage::HTTPMessage(byte* pData, unsigned int len) : ByteBuffer(pData, len) {`
	`28`	`+HTTPMessage::HTTPMessage(const byte* pData, unsigned int len) : ByteBuffer(pData, len) {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ class HTTPMessage : public ByteBuffer {`
`93`	`93`	`public:`
`94`	`94`	`HTTPMessage();`
`95`	`95`	`explicit HTTPMessage(std::string const& sData);`
`96`		`- explicit HTTPMessage(byte *pData, unsigned int len);`
	`96`	`+ explicit HTTPMessage(const byte *pData, unsigned int len);`
`97`	`97`	`virtual ~HTTPMessage() = default;`
`98`	`98`
`99`	`99`	`virtual byte* create() = 0;`
`@@ -124,7 +124,7 @@ class HTTPMessage : public ByteBuffer {`
`124`	`124`	`return parseErrorStr;`
`125`	`125`	`}`
`126`	`126`
`127`		`- void setVersion(std::string v) {`
	`127`	`+ void setVersion(std::string const& v) {`
`128`	`128`	`version = v;`
`129`	`129`	`}`
`130`	`130`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ HTTPRequest::HTTPRequest() : HTTPMessage() {`
`25`	`25`	`HTTPRequest::HTTPRequest(std::string const& sData) : HTTPMessage(sData) {`
`26`	`26`	`}`
`27`	`27`
`28`		`-HTTPRequest::HTTPRequest(byte* pData, unsigned int len) : HTTPMessage(pData, len) {`
	`28`	`+HTTPRequest::HTTPRequest(const byte* pData, unsigned int len) : HTTPMessage(pData, len) {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ HTTPResponse::HTTPResponse() : HTTPMessage() {`
`25`	`25`	`HTTPResponse::HTTPResponse(std::string const& sData) : HTTPMessage(sData) {`
`26`	`26`	`}`
`27`	`27`
`28`		`-HTTPResponse::HTTPResponse(byte* pData, unsigned int len) : HTTPMessage(pData, len) {`
	`28`	`+HTTPResponse::HTTPResponse(const byte* pData, unsigned int len) : HTTPMessage(pData, len) {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -662,7 +662,7 @@ ResourceHost* HTTPServer::getResourceHostForRequest(HTTPRequest* req) {`
`662`	`662`
`663`	`663`	`// All vhosts have the port appended, so need to append it to the host if it doesnt exist`
`664`	`664`	`if (!host.contains(":")) {`
`665`		`- host.append(":" + std::to_string(listenPort));`
	`665`	`+ host.append(std::format(":{}", listenPort));`
`666`	`666`	`}`
`667`	`667`
`668`	`668`	`std::unordered_map<std::string, ResourceHost*>::const_iterator it = vhosts.find(host);`