Address sonar coverage issues.

lwasylow · lwasylow · commit b30688cae39e · 2023-04-01T08:31:13.000-07:00
diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb
@@ -227,11 +227,10 @@ create or replace package body ut_suite_cache_manager is
     - = NOT
     we will perform a replace of that characters into
     new notation.
-    || = OR
-    && = AND
-    ^  = NOT
+    | = OR
+    & = AND
+    !  = NOT
   */
-  --TODO: How do we prevent when old notation reach 4k an new will be longer?
   function replace_legacy_tag_notation(a_tags varchar2
   ) return varchar2 is
     l_tags ut_varchar2_list := ut_utils.string_to_table(a_tags,',');
@@ -331,8 +330,11 @@ with
       )
     ) t where c.id = t.id and r_num = 1 ]';
     
-    execute immediate l_sql bulk collect into  l_suite_tags using a_suite_items;   
-    return l_suite_tags;        
+    execute immediate l_sql bulk collect into  l_suite_tags using a_suite_items;
+    return l_suite_tags;
+  exception when others then
+    --If the dynamic SQL fails we will fall gracefully with meaningfull message
+    raise_application_error(ut_utils.gc_invalid_tag_expression, 'Tag expression, causing error. If expression is correct please report error.');    
   end;
   
   /*
diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb
@@ -990,15 +990,21 @@ create or replace package body ut_utils is
     return l_result;
   end;
 
+  /*
+    Purpose of this function is to break down the tag expressions
+    We can separate operators on left and rigth side.
+    Left ones are AND and OR as they require an operator on left side to 
+    be valid. Right side is NOT.
+    In each iteration we breakdown string into parts
+
+  */  
   function valid_tag_expression(a_tags in varchar2) return number is
-    t_left_side ut_varchar2_list := ut_varchar2_list('|','&',',');
-    t_right_side  ut_varchar2_list := ut_varchar2_list('!','-');
     l_left_side_expression varchar2(100) := '[|&,]';
-    l_left_side_regex varchar(400) := '([^|&,]*)[|&,](.*)';    
+    l_left_side_regex varchar2(400) := '([^|&,]*)[|&,](.*)';    
     l_left_side varchar2(4000);
     
     l_rigth_side_expression varchar2(100) := '[!-]';    
-    l_right_side_regex varchar(400) := '([!-])([^!-].*)';
+    l_right_side_regex varchar2(400) := '([!-])([^!-].*)';
     l_right_side varchar2(4000);
     
     l_tags varchar2(4000) := a_tags;
