Replace deprecated GEventEvaluator with JaninoEventEvaluator

Change-Id: I21bfd0aaa66a32ecc1755cbe1efd78b0cd4254cf
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3984

diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml
index 2098836..dc51c16 100644 (file)
--- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml
+++ b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml
@@ -72,10 +72,8 @@
 
         <!-- accept INFO, DEBUG and TRACE level -->
         <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-            <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
-                <expression>
-                    e.level.toInt() &lt;= INFO.toInt()
-                </expression>
+            <evaluator> <!-- defaults to type ch.qos.logback.classic.boolex.JaninoEventEvaluator -->
+                <expression>return level &lt;= INFO;</expression>
             </evaluator>
             <OnMismatch>DENY</OnMismatch>
             <OnMatch>ACCEPT</OnMatch>
@@ -190,12 +188,12 @@
     </appender>
 
 
-    <!-- Supporability log -->
+    <!-- Supportability log -->
     <appender name="SUPPORTABILITY_ROLLING" class="ch.qos.logback.core.rolling.RollingFileAppender">
 
         <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/supportability.log</file>
 
-        <!-- Supporability messages filter - accept suppportability messages -->
+        <!-- Supportability messages filter - accept supportability messages -->
         <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
             <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
                 <marker>SUPPORTABILITY_MARKER</marker>

diff --git a/catalog-be/src/main/resources/config/logback.xml b/catalog-be/src/main/resources/config/logback.xml
index 2098836..dc51c16 100644 (file)
--- a/catalog-be/src/main/resources/config/logback.xml
+++ b/catalog-be/src/main/resources/config/logback.xml
@@ -72,10 +72,8 @@
 
         <!-- accept INFO, DEBUG and TRACE level -->
         <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-            <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
-                <expression>
-                    e.level.toInt() &lt;= INFO.toInt()
-                </expression>
+            <evaluator> <!-- defaults to type ch.qos.logback.classic.boolex.JaninoEventEvaluator -->
+                <expression>return level &lt;= INFO;</expression>
             </evaluator>
             <OnMismatch>DENY</OnMismatch>
             <OnMatch>ACCEPT</OnMatch>
@@ -190,12 +188,12 @@
     </appender>
 
 
-    <!-- Supporability log -->
+    <!-- Supportability log -->
     <appender name="SUPPORTABILITY_ROLLING" class="ch.qos.logback.core.rolling.RollingFileAppender">
 
         <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/supportability.log</file>
 
-        <!-- Supporability messages filter - accept suppportability messages -->
+        <!-- Supportability messages filter - accept supportability messages -->
         <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
             <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
                 <marker>SUPPORTABILITY_MARKER</marker>

diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-logback.xml b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-logback.xml
index 7ae4438..452262e 100644 (file)
--- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-logback.xml
+++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-logback.xml
@@ -107,10 +107,8 @@
 
                 <!-- accept DEBUG and TRACE level -->
                 <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-                        <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
-                                <expression>
-                                        e.level.toInt() &lt;= DEBUG.toInt()
-                                </expression>
+                        <evaluator> <!-- defaults to type ch.qos.logback.classic.boolex.JaninoEventEvaluator -->
+                                <expression>return level &lt;= DEBUG;</expression>
                         </evaluator>
                         <OnMismatch>DENY</OnMismatch>
                         <OnMatch>NEUTRAL</OnMatch>

diff --git a/catalog-fe/src/main/resources/config/logback.xml b/catalog-fe/src/main/resources/config/logback.xml
index d7c9c7e..58fd1fe 100644 (file)
--- a/catalog-fe/src/main/resources/config/logback.xml
+++ b/catalog-fe/src/main/resources/config/logback.xml
@@ -50,10 +50,8 @@
 
         <!-- accept INFO, DEBUG and TRACE level -->
         <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-            <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
-                <expression>
-                    e.level.toInt() &lt;= INFO.toInt()
-                </expression>
+            <evaluator> <!-- defaults to type ch.qos.logback.classic.boolex.JaninoEventEvaluator -->
+                <expression>return level &lt;= INFO;</expression>
             </evaluator>
             <OnMismatch>DENY</OnMismatch>
             <OnMatch>ACCEPT</OnMatch>

diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/logback.xml b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/logback.xml
index 49ae967..e709735 100644 (file)
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/logback.xml
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/logback.xml
@@ -68,10 +68,8 @@
 
         <!-- accept INFO, DEBUG and TRACE level -->
         <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-            <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
-                <expression>
-                    e.level.toInt() &lt;= INFO.toInt()
-                </expression>
+            <evaluator> <!-- defaults to type ch.qos.logback.classic.boolex.JaninoEventEvaluator -->
+                <expression>return level &lt;= INFO;</expression>
             </evaluator>
             <OnMismatch>DENY</OnMismatch>
             <OnMatch>ACCEPT</OnMatch>

diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml
index 2098836..dc51c16 100644 (file)
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml
@@ -72,10 +72,8 @@
 
         <!-- accept INFO, DEBUG and TRACE level -->
         <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-            <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
-                <expression>
-                    e.level.toInt() &lt;= INFO.toInt()
-                </expression>
+            <evaluator> <!-- defaults to type ch.qos.logback.classic.boolex.JaninoEventEvaluator -->
+                <expression>return level &lt;= INFO;</expression>
             </evaluator>
             <OnMismatch>DENY</OnMismatch>
             <OnMatch>ACCEPT</OnMatch>
@@ -190,12 +188,12 @@
     </appender>
 
 
-    <!-- Supporability log -->
+    <!-- Supportability log -->
     <appender name="SUPPORTABILITY_ROLLING" class="ch.qos.logback.core.rolling.RollingFileAppender">
 
         <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/supportability.log</file>
 
-        <!-- Supporability messages filter - accept suppportability messages -->
+        <!-- Supportability messages filter - accept supportability messages -->
         <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
             <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
                 <marker>SUPPORTABILITY_MARKER</marker>

diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/main/resources/additional-logback.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/main/resources/additional-logback.xml
index cec94f1..16ece54 100644 (file)
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/main/resources/additional-logback.xml
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/main/resources/additional-logback.xml
@@ -33,10 +33,8 @@
 
                <!-- accept DEBUG and TRACE level -->
                <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-                       <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
-                               <expression>
-                                       e.level.toInt() &lt;= DEBUG.toInt()
-                               </expression>
+                       <evaluator> <!-- defaults to type ch.qos.logback.classic.boolex.JaninoEventEvaluator -->
+                               <expression>return level &lt;= DEBUG;</expression>
                        </evaluator>
                        <OnMismatch>DENY</OnMismatch>
                        <OnMatch>NEUTRAL</OnMatch>

diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/main/resources/logback.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/main/resources/logback.xml
index 92c486e..cb9bd06 100644 (file)
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/main/resources/logback.xml
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/main/resources/logback.xml
@@ -112,10 +112,8 @@
 
                <!-- accept DEBUG and TRACE level -->
                <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-                       <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
-                               <expression>
-                                       e.level.toInt() &lt;= DEBUG.toInt()
-                               </expression>
+                       <evaluator> <!-- defaults to type ch.qos.logback.classic.boolex.JaninoEventEvaluator -->
+                               <expression>return level &lt;= DEBUG;</expression>
                        </evaluator>
                        <OnMismatch>DENY</OnMismatch>
                        <OnMatch>NEUTRAL</OnMatch>
@@ -157,10 +155,8 @@
 
                <!-- accept DEBUG and TRACE level -->
                <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-                       <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
-                               <expression>
-                                       e.level.toInt() &lt;= DEBUG.toInt()
-                               </expression>
+                       <evaluator> <!-- defaults to type ch.qos.logback.classic.boolex.JaninoEventEvaluator -->
+                               <expression>return level &lt;= DEBUG;</expression>
                        </evaluator>
                        <OnMismatch>DENY</OnMismatch>
                        <OnMatch>NEUTRAL</OnMatch>