Merge remote-tracking branch 'origin/switchToGin' into develop

Author: EvilLord666

Dockerfile

@@ -28,6 +28,7 @@ COPY "go.mod" ./"go.mod"
 COPY "go.sum" ./"go.sum"
 COPY keyfile ./keyfile
 COPY "main.go" ./"main.go"
+COPY "main_defs.go" ./"main_defs.go"
 COPY "config_docker_w_redis.json" ./"config_docker_w_redis.json"
 COPY tools/"create_wissance_demo_users_docker.sh" ./"create_wissance_demo_users_docker.sh"
 COPY tools/"docker_app_runner.sh" ./"docker_app_runner.sh"

api/rest/common.go

@@ -2,7 +2,7 @@ package rest
 
 import (
 	"encoding/json"
-	"net/http"
+	"github.com/gin-gonic/gin"
 )
 
 const (
@@ -19,23 +19,23 @@ const (
 // beforeHandle
 /* This function prepare response headers prior to response handle. It sets content-type and CORS headers.
  * Parameters:
- *     - respWriter - gorilla/mux response writer
+ *     - respWriter - gin response writer
  * Returns nothing
  */
-func beforeHandle(respWriter *http.ResponseWriter) {
+func beforeHandle(respWriter *gin.ResponseWriter) {
 	(*respWriter).Header().Set("Content-Type", "application/json")
 	(*respWriter).Header().Set("Accept", "application/json")
 }
 
 // afterHandle
 /* This function finalize response handle: serialize (json) and write object and set status code. If error occur during object serialization status code sets to 500
  * Parameters:
- *     - respWriter - gorilla/mux response writer
+ *     - respWriter - gin response writer
  *     - statusCode - http response status
  *     - data - object (json) could be empty
  * Returns nothing
  */
-func afterHandle(respWriter *http.ResponseWriter, statusCode int, data interface{}) {
+func afterHandle(respWriter *gin.ResponseWriter, statusCode int, data interface{}) {
 	(*respWriter).WriteHeader(statusCode)
 	if data != nil {
 		err := json.NewEncoder(*respWriter).Encode(data)

api/rest/metrics/prometheus_handler.go

@@ -0,0 +1,14 @@
+package metrics
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+)
+
+func GetPrometheusHandler() gin.HandlerFunc {
+	h := promhttp.Handler()
+
+	return func(c *gin.Context) {
+		h.ServeHTTP(c.Writer, c.Request)
+	}
+}

api/rest/utilities.go

@@ -4,7 +4,7 @@ import (
 	"unicode"
 )
 
-// Checks that the string consists of allowed characters.
+// Validate function that checks that whether a string consists of allowed characters or not
 func Validate(str string) bool {
 	if str == "" {
 		return false