Apply suggestions from code review

telefonicaid · May 29, 2024 · 047a63b · 047a63b
1 parent b0df97e
commit 047a63b
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/publishimage-master.yml b/.github/workflows/publishimage-master.yml
@@ -1,6 +1,7 @@
 name: Publish Docker image (master)
 
 # The workflow will push images for master on every merge
+# Ideally, this should be done at dockerhub, but it doesn't support secrets (see https://stackoverflow.com/questions/78446824/use-environment-variables-with-sensible-information-in-docker-hub-autobuild)
 
 on:
   push:

diff --git a/.github/workflows/publishimage-tag.yml b/.github/workflows/publishimage-tag.yml
@@ -1,6 +1,7 @@
 name: Publish Docker image (tag)
 
 # The workflow will push images on every tag in the format x.y.z
+# Ideally, this should be done at dockerhub, but it doesn't support secrets (see https://stackoverflow.com/questions/78446824/use-environment-variables-with-sensible-information-in-docker-hub-autobuild)
 
 on:
   push:

diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -4,4 +4,3 @@
 - Fix: use null for non existing attributes in macro substitution applied to "paylaod" field (instead of empty string) to make behaviour more consistent (#4004)
 - Fix: simplified GET /version operation, without including "libversions" field (add ?options=libVersions to get it)
 - Fix: lighter operation to get databases list from MongoDB (#4517)
-
diff --git a/doc/manuals/devel/sourceCode.md b/doc/manuals/devel/sourceCode.md
@@ -24,7 +24,7 @@
 * [src/lib/cache/](#srclibcache) (Subscription cache implementation)
 * [src/lib/logSummary/](#srcliblogsummary) (Log Summary implementation)
 * [src/lib/metricsMgr/](#srclibmetricsmgr) (Metrics Manager implementation)
-* [src/lib/expressions/](#seribexpressions) (Custom notification expressions support)
+* [src/lib/expressions/](#srclibexpressions) (Custom notification expressions support)
 
 ## src/app/contextBroker/
 The main program is found in `contextBroker.cpp` and its purpose it to:

diff --git a/doc/manuals/orion-api.md b/doc/manuals/orion-api.md
@@ -432,7 +432,7 @@ There are some exception cases in which the above restrictions do not apply. In
 * URL parameter `q` allows the special characters needed by the [Simple Query Language](#simple-query-language)
 * URL parameter `mq` allows the special characters needed by the [Simple Query Language](#simple-query-language)
 * URL parameter `georel` and `coords` allow `;`
-* Within `ngsi` (i.e. `id`, `type` and attribute values) in [NGSI Payload patching](#ngsi-payload-patching) (to support characters used in the JEXL expression syntax)
+* Within `ngsi` (i.e. `id`, `type` and attribute values) in [NGSI Payload patching](#ngsi-payload-patching) (to support characters used in the [JEXL expression syntax](#jexl-support))
 * Whichever attribute value which uses `TextUnrestricted` as attribute type (see [Special Attribute Types](#special-attribute-types) section)
 
 ## Identifiers syntax restrictions

diff --git a/src/lib/expressions/ExprContext.cpp b/src/lib/expressions/ExprContext.cpp
@@ -217,7 +217,6 @@ std::string ExprContextList::get(void)
 */
 void ExprContextList::add(const std::string &_value)
 {
-
   LM_T(LmtExpr, ("adding to JEXL expression context list (string): %s", _value.c_str()));
   jh.addString(_value);
 }
@@ -279,7 +278,6 @@ void ExprContextList::add(ExprContextObject exprContextObject)
 */
 void ExprContextList::add(ExprContextList exprContextList)
 {
-
   std::string s = exprContextList.get();
   LM_T(LmtExpr, ("adding to JEXL expression context list (list): %s", s.c_str()));
   jh.addRaw(s);

diff --git a/src/lib/expressions/ExprManager.cpp b/src/lib/expressions/ExprManager.cpp
@@ -46,7 +46,7 @@ static const char* cjexl_eval(void* ptr, const char* script_ptr, const char* con
   return "";
 }
 #else
-// Interface to use libcjexl.a
+// Interface to use libcjexl
 extern "C" {
     void* cjexl_new_engine();
 }
@@ -72,7 +72,6 @@ void ExprManager::init(void)
 
 
 
-
 /* ****************************************************************************
 *
 * ExprManager::evaluate -

diff --git a/src/lib/rest/rest.cpp b/src/lib/rest/rest.cpp
@@ -618,8 +618,8 @@ static void requestCompleted
     clock_addtime(&accTimeStat.mongoWriteWaitTime,    &threadLastTimeStat.mongoWriteWaitTime);
     clock_addtime(&accTimeStat.mongoReadWaitTime,     &threadLastTimeStat.mongoReadWaitTime);
     clock_addtime(&accTimeStat.mongoCommandWaitTime,  &threadLastTimeStat.mongoCommandWaitTime);
-    clock_addtime(&accTimeStat.exprBasicCtxBldTime,  &threadLastTimeStat.exprBasicCtxBldTime);
-    clock_addtime(&accTimeStat.exprBasicEvalTime,    &threadLastTimeStat.exprBasicEvalTime);
+    clock_addtime(&accTimeStat.exprBasicCtxBldTime,   &threadLastTimeStat.exprBasicCtxBldTime);
+    clock_addtime(&accTimeStat.exprBasicEvalTime,     &threadLastTimeStat.exprBasicEvalTime);
     clock_addtime(&accTimeStat.exprJexlCtxBldTime,    &threadLastTimeStat.exprJexlCtxBldTime);
     clock_addtime(&accTimeStat.exprJexlEvalTime,      &threadLastTimeStat.exprJexlEvalTime);
     clock_addtime(&accTimeStat.renderTime,            &threadLastTimeStat.renderTime);

diff --git a/src/lib/serviceRoutines/versionTreat.cpp b/src/lib/serviceRoutines/versionTreat.cpp
@@ -48,7 +48,7 @@
 #include <mosquitto.h>
 
 #ifndef EXPR_BASIC
-// Interface to use libcjexl.a
+// Interface to use libcjexl
 extern "C" {
     const char* cjexl_version();
 }