Merge "ONAP Service Mesh compliant modification"
authorSeshu Kumar M <seshu.kumar.m@huawei.com>
Wed, 7 Jul 2021 07:29:14 +0000 (07:29 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 7 Jul 2021 07:29:14 +0000 (07:29 +0000)
30 files changed:
adapters/mso-adapter-utils/src/test/resources/logback-test.xml
adapters/mso-catalog-db-adapter/src/test/resources/logback-test.xml
adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/orchestration/PollService.java
adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/orchestration/RollbackService.java
adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/orchestration/StackService.java
adapters/mso-openstack-adapters/src/test/resources/logback-test.xml
adapters/mso-requests-db-adapter/src/test/resources/logback-test.xml
adapters/mso-sdnc-adapter/src/test/resources/logback-test.xml
adapters/so-appc-orchestrator/src/test/resources/logback-test.xml
asdc-controller/src/test/resources/logback-test.xml
bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterTest.groovy
bpmn/MSOCommonBPMN/src/test/resources/logback-test.xml
bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/xml/XmlTool.java
bpmn/MSOCoreBPMN/src/test/resources/logback-test.xml
bpmn/pom.xml
bpmn/so-bpmn-building-blocks/src/test/resources/logback-test.xml
bpmn/so-bpmn-infrastructure-common/src/test/resources/logback-test.xml
bpmn/so-bpmn-infrastructure-flows/src/test/resources/logback-test.xml
bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/network/tasks/NetworkAdapterImpl.java
bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/tasks/SDNCRequestTasks.java
bpmn/so-bpmn-tasks/src/test/resources/logback-test.xml [new file with mode: 0644]
common/src/test/resources/logback-test.xml
cxf-logging/src/test/resources/logback-test.xml
graph-inventory/aai-client/src/test/resources/logback-test.xml [new file with mode: 0644]
mso-api-handlers/mso-api-handler-infra/src/test/resources/logback-test.xml
mso-api-handlers/mso-requests-db-repositories/src/test/resources/logback-test.xml
mso-api-handlers/mso-requests-db/src/test/resources/logback-test.xml
mso-catalog-db/src/test/resources/logback-test.xml
so-sdn-clients/src/test/resources/logback-test.xml [new file with mode: 0644]
so-simulator/src/test/resources/log4j.properties

index 3873b2c..ca600b5 100644 (file)
   ============LICENSE_END=========================================================
   -->
 
-<configuration >
-  
-  
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}||%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}||%X{Timer}|%msg%n</pattern>
-    </encoder>
-  </appender>
+<configuration>
 
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}||%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}||%X{Timer}|%msg%n
+            </pattern>
+        </encoder>
+    </appender>
 
-  <logger name="com.att.eelf.audit" level="info" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger>
-  
-  <logger name="com.att.eelf.metrics" level="info" additivity="false">
+    <logger name="com.att.eelf.audit" level="info" additivity="false">
         <appender-ref ref="STDOUT" />
-  </logger>
-
-  <logger name="com.att.eelf.error" level="trace" additivity="false">
-       <appender-ref ref="STDOUT" />
-  </logger> 
-       <logger name="org.onap" level="${so.log.level:-DEBUG}"
-               additivity="false">
-               <appender-ref ref="STDOUT" />
-       </logger>
-
-  <root level="info">
-    <appender-ref ref="STDOUT" />
-  </root>
+    </logger>
+
+    <logger name="com.att.eelf.metrics" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="com.att.eelf.error" level="trace" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+    <logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="org.reflections" level="ERROR" />
+    
+    <root level="info">
+        <appender-ref ref="STDOUT" />
+    </root>
+
 
 </configuration>
index 97a4503..7c795ee 100644 (file)
@@ -1,46 +1,47 @@
 <configuration>
 
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <appender name="test" class="org.onap.so.adapters.catalogdb.catalogrest.TestAppender" />
-
-  <logger name="com.att.ecomp.audit" level="info" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger>
-
-  <logger name="com.att.eelf.metrics" level="info" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger>
-
-  <logger name="com.att.eelf.error" level="WARN" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger>
-
-  <logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false">
-    <appender-ref ref="STDOUT" />
-    <appender-ref ref="test" />
-  </logger>
-
-  <logger name="org.flywaydb" level="DEBUG" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger>
-  <logger name="org.hibernate" level="DEBUG" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger>
-
-  <logger name="ch.vorburger" level="WARN" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger>
-
-
-  <root level="WARN">
-    <appender-ref ref="STDOUT" />
-    <appender-ref ref="test" />
-  </root>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="test" class="org.onap.so.adapters.catalogdb.catalogrest.TestAppender" />
+
+    <logger name="com.att.ecomp.audit" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="com.att.eelf.metrics" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="com.att.eelf.error" level="WARN" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="test" />
+    </logger>
+
+    <logger name="org.flywaydb" level="DEBUG" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+    <logger name="org.hibernate" level="DEBUG" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="ch.vorburger" level="WARN" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="org.reflections" level="ERROR" />
+    
+    <root level="WARN">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="test" />
+    </root>
 
 
 </configuration>
\ No newline at end of file
index 31da330..dfb3075 100644 (file)
@@ -24,12 +24,15 @@ package org.onap.so.adapters.tasks.orchestration;
 
 import java.io.ByteArrayInputStream;
 import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import javax.xml.XMLConstants;
 import javax.xml.bind.JAXB;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.camunda.bpm.client.task.ExternalTask;
 import org.camunda.bpm.client.task.ExternalTaskService;
@@ -66,6 +69,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.w3c.dom.Document;
 import com.woorea.openstack.heat.model.Stack;
 
 @Component
@@ -318,14 +322,16 @@ public class PollService extends ExternalTaskUtils {
         success.setTrue();
     }
 
-    protected Optional<String> findRequestType(String xmlString) {
+    protected Optional<String> findRequestType(final String xmlString) {
         try {
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-            DocumentBuilder builder = factory.newDocumentBuilder();
-            org.w3c.dom.Document doc;
-            doc = builder.parse(new ByteArrayInputStream(xmlString.getBytes("UTF-8")));
+            final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, StringUtils.EMPTY);
+            factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, StringUtils.EMPTY);
+
+            final DocumentBuilder builder = factory.newDocumentBuilder();
+            final Document doc = builder.parse(new ByteArrayInputStream(xmlString.getBytes(StandardCharsets.UTF_8)));
             return Optional.of(doc.getDocumentElement().getNodeName());
-        } catch (Exception e) {
+        } catch (final Exception e) {
             logger.error("Error Finding Request Type", e);
             return Optional.empty();
         }
index 4636a91..b9e86b0 100644 (file)
@@ -2,13 +2,16 @@ package org.onap.so.adapters.tasks.orchestration;
 
 import java.io.ByteArrayInputStream;
 import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import javax.xml.XMLConstants;
 import javax.xml.bind.JAXB;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.ws.Holder;
+import org.apache.commons.lang3.StringUtils;
 import org.camunda.bpm.client.task.ExternalTask;
 import org.camunda.bpm.client.task.ExternalTaskService;
 import org.onap.so.adapters.network.MsoNetworkAdapterImpl;
@@ -24,6 +27,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.w3c.dom.Document;
 
 @Component
 public class RollbackService extends ExternalTaskUtils {
@@ -110,14 +114,16 @@ public class RollbackService extends ExternalTaskUtils {
         }
     }
 
-    protected Optional<String> findRequestType(String xmlString) {
+    protected Optional<String> findRequestType(final String xmlString) {
         try {
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-            DocumentBuilder builder = factory.newDocumentBuilder();
-            org.w3c.dom.Document doc;
-            doc = builder.parse(new ByteArrayInputStream(xmlString.getBytes("UTF-8")));
+            final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, StringUtils.EMPTY);
+            factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, StringUtils.EMPTY);
+
+            final DocumentBuilder builder = factory.newDocumentBuilder();
+            final Document doc = builder.parse(new ByteArrayInputStream(xmlString.getBytes(StandardCharsets.UTF_8)));
             return Optional.of(doc.getDocumentElement().getNodeName());
-        } catch (Exception e) {
+        } catch (final Exception e) {
             logger.error("Error Finding Request Type", e);
             return Optional.empty();
         }
index 9b2badd..4fc4263 100644 (file)
@@ -24,14 +24,17 @@ package org.onap.so.adapters.tasks.orchestration;
 
 import java.io.ByteArrayInputStream;
 import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import javax.xml.XMLConstants;
 import javax.xml.bind.JAXB;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.ws.Holder;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.camunda.bpm.client.task.ExternalTask;
 import org.camunda.bpm.client.task.ExternalTaskService;
@@ -59,6 +62,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.w3c.dom.Document;
 
 @Component
 public class StackService extends ExternalTaskUtils {
@@ -342,14 +346,16 @@ public class StackService extends ExternalTaskUtils {
 
     }
 
-    protected Optional<String> findRequestType(String xmlString) {
+    protected Optional<String> findRequestType(final String xmlString) {
         try {
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-            DocumentBuilder builder = factory.newDocumentBuilder();
-            org.w3c.dom.Document doc;
-            doc = builder.parse(new ByteArrayInputStream(xmlString.getBytes("UTF-8")));
+            final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, StringUtils.EMPTY);
+            factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, StringUtils.EMPTY);
+
+            final DocumentBuilder builder = factory.newDocumentBuilder();
+            final Document doc = builder.parse(new ByteArrayInputStream(xmlString.getBytes(StandardCharsets.UTF_8)));
             return Optional.of(doc.getDocumentElement().getNodeName());
-        } catch (Exception e) {
+        } catch (final Exception e) {
             logger.error("Error Finding Request Type", e);
             return Optional.empty();
         }
index 8bfa6d8..a2cf7db 100644 (file)
@@ -18,8 +18,8 @@
   ============LICENSE_END=========================================================
   -->
 
-<configuration >
+<configuration>
+
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{HH:mm:ss.SSS} [%thread] |%X{RequestId}| %-5level
         </encoder>
     </appender>
 
+    <logger name="com.woorea.openstack" level="${so.log.level:-DEBUG}" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
 
+    <logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
 
-  <logger name="com.woorea.openstack" level="${so.log.level:-DEBUG}" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger> 
-  
- <logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger>
-
+    <logger name="org.reflections" level="ERROR" />
 
-  <root level="WARN">
-    <appender-ref ref="STDOUT" />
-  </root>
+    <root level="WARN">
+        <appender-ref ref="STDOUT" />
+    </root>
 
 </configuration>
index a63bd27..c676d7f 100644 (file)
@@ -1,48 +1,48 @@
 <configuration>
-       <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-               <encoder>
-                       <pattern>%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}||%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}||%X{Timer}|%msg%n</pattern>
-               </encoder>
-       </appender>
-
-       <appender name="test"
-               class="org.onap.so.adapters.requestsdb.application.TestAppender" />
-
-       <logger name="com.att.ecomp.audit" level="info" additivity="false">
-               <appender-ref ref="STDOUT" />
-       </logger>
-
-       <logger name="com.att.eelf.metrics" level="info" additivity="false">
-               <appender-ref ref="STDOUT" />
-       </logger>
-
-       <logger name="com.att.eelf.error" level="WARN" additivity="false">
-               <appender-ref ref="STDOUT" />
-       </logger>
-
-       <logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false">
-               <appender-ref ref="STDOUT" />
-               <appender-ref ref="test" />
-       </logger>
-       
-       <logger name="org.flywaydb" level="DEBUG" additivity="false">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}||%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}||%X{Timer}|%msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <appender name="test" class="org.onap.so.adapters.requestsdb.application.TestAppender" />
+
+    <logger name="com.att.ecomp.audit" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="com.att.eelf.metrics" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="com.att.eelf.error" level="WARN" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false">
         <appender-ref ref="STDOUT" />
+        <appender-ref ref="test" />
     </logger>
-       
-
-       <logger name="ch.vorburger" level="WARN" additivity="false">
-               <appender-ref ref="STDOUT" />
-       </logger>
-  
-  <logger name="org.hibernate" level="DEBUG" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger>
-       
-
-       <root level="WARN">
-               <appender-ref ref="STDOUT" />
-               <appender-ref ref="test" />
-       </root>
 
+    <logger name="org.flywaydb" level="DEBUG" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+
+    <logger name="ch.vorburger" level="WARN" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="org.hibernate" level="DEBUG" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="org.reflections" level="ERROR" />
+
+    <root level="WARN">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="test" />
+    </root>
 
 </configuration>
\ No newline at end of file
index 3a3e57a..0b44f79 100644 (file)
@@ -18,8 +18,8 @@
   ============LICENSE_END=========================================================
   -->
 
-<configuration >
+<configuration>
+
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{HH:mm:ss.SSS} [%thread] |%X{RequestId}| %-5level
     </appender>
 
 
-  <logger name="com.att.eelf.audit" level="INFO" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger>
-  
-  <logger name="com.att.eelf.metrics" level="INFO" additivity="false">
+    <logger name="com.att.eelf.audit" level="INFO" additivity="false">
         <appender-ref ref="STDOUT" />
-  </logger>
+    </logger>
 
-  <logger name="com.att.eelf.error" level="WARN" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger> 
-  
-   <logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false">
-               <appender-ref ref="STDOUT" />
-       </logger>
+    <logger name="com.att.eelf.metrics" level="INFO" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
 
-  <root level="WARN">
-    <appender-ref ref="STDOUT" />
-  </root>
+    <logger name="com.att.eelf.error" level="WARN" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="org.reflections" level="ERROR" />
+    <root level="WARN">
+        <appender-ref ref="STDOUT" />
+    </root>
 
 </configuration>
index 8a9e705..eaf5a9c 100644 (file)
@@ -1,31 +1,32 @@
 <configuration>
-  
-  
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-
-  <logger name="com.att.ecomp.audit" level="info" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger>
-  
-  <logger name="com.att.eelf.metrics" level="info" additivity="false">
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+
+    <logger name="com.att.ecomp.audit" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="com.att.eelf.metrics" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="com.att.eelf.error" level="trace" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="org.onap" level="${so.log.level:-WARN}" additivity="false">
         <appender-ref ref="STDOUT" />
-  </logger>
-
-  <logger name="com.att.eelf.error" level="trace" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger> 
-  
-       <logger name="org.onap" level="${so.log.level:-WARN}" additivity="false">
-               <appender-ref ref="STDOUT" />
-       </logger>
-
-  <root level="WARN">
-    <appender-ref ref="STDOUT" />
-  </root>
-  
+    </logger>
+
+    <logger name="org.reflections" level="ERROR" />
+    
+    <root level="WARN">
+        <appender-ref ref="STDOUT" />
+    </root>
+
 </configuration>
\ No newline at end of file
index d74de50..75b2523 100644 (file)
@@ -1,7 +1,5 @@
 <configuration>
 
-
-
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{HH:mm:ss.SSS} [%thread] |%X{RequestId}| %-5level
     </logger>
 
     <logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false">
-               <appender-ref ref="STDOUT" />
-       </logger>
-    
+        <appender-ref ref="STDOUT" />
+    </logger>
 
     <logger name="ch.vorburger" level="WARN" additivity="false">
         <appender-ref ref="STDOUT" />
     </logger>
 
+    <logger name="org.reflections" level="ERROR" />
+
     <root level="WARN">
         <appender-ref ref="STDOUT" />
     </root>
 
-
 </configuration>
\ No newline at end of file
index 3438c79..235b621 100644 (file)
@@ -22,7 +22,6 @@ package org.onap.so.bpmn.common.scripts
 
 
 import static org.mockito.Mockito.*
-
 import org.camunda.bpm.engine.ProcessEngineServices
 import org.camunda.bpm.engine.RepositoryService
 import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
@@ -48,10 +47,10 @@ public class SDNCAdapterTest {
        }
 
 
-       String workflowResponse = """<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1"
+       String workflowResponse = """<sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns="com:att:sdnctl:l3api"
+                                                 xmlns:sdncadapterworkflow="http://org.onap/so/workflow/schema/v1"
                                                  xmlns:tag0="http://org.onap/workflow/sdnc/adapter/schema/v1"
-                                                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                                                 xmlns="com:att:sdnctl:l3api">
+                                                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <sdncadapterworkflow:response-data>
       <tag0:CallbackHeader>
          <tag0:RequestId>testRequestId</tag0:RequestId>
index 9088d1a..90f73dc 100644 (file)
@@ -24,7 +24,7 @@
   <root level="WARN">
     <appender-ref ref="STDOUT" />
   </root>
-
+  <logger name="org.reflections" level="ERROR" />
   <logger name="wiremock.org" level="ERROR" />
 
 </configuration>
\ No newline at end of file
index da096e5..79a4c54 100644 (file)
@@ -49,6 +49,7 @@ import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -87,44 +88,47 @@ public final class XmlTool {
      * @throws SAXException
      * @throws XPathExpressionException
      */
-    public static String normalize(Object xml) throws IOException, TransformerException, ParserConfigurationException,
-            SAXException, XPathExpressionException {
+    public static String normalize(final Object xml) throws IOException, TransformerException,
+            ParserConfigurationException, SAXException, XPathExpressionException {
 
         if (xml == null) {
             return null;
         }
 
-        Source xsltSource = new StreamSource(new StringReader(readResourceFile("normalize-namespaces.xsl")));
+        final Source xsltSource = new StreamSource(new StringReader(readResourceFile("normalize-namespaces.xsl")));
 
-        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+        final DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
         dbFactory.setNamespaceAware(true);
         dbFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
         dbFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
-        DocumentBuilder db = dbFactory.newDocumentBuilder();
-        InputSource source = new InputSource(new StringReader(String.valueOf(xml)));
-        Document doc = db.parse(source);
+        final DocumentBuilder db = dbFactory.newDocumentBuilder();
+        final InputSource source = new InputSource(new StringReader(String.valueOf(xml)));
+        final Document doc = db.parse(source);
 
         // Start of code to remove whitespace outside of tags
-        XPath xPath = XPathFactory.newInstance().newXPath();
-        NodeList nodeList = (NodeList) xPath.evaluate("//text()[normalize-space()='']", doc, XPathConstants.NODESET);
+        final XPath xPath = XPathFactory.newInstance().newXPath();
+        final NodeList nodeList =
+                (NodeList) xPath.evaluate("//text()[normalize-space()='']", doc, XPathConstants.NODESET);
 
         for (int i = 0; i < nodeList.getLength(); ++i) {
-            Node node = nodeList.item(i);
+            final Node node = nodeList.item(i);
             node.getParentNode().removeChild(node);
         }
         // End of code to remove whitespace outside of tags
 
         // the factory pattern supports different XSLT processors
-        TransformerFactory transformerFactory = TransformerFactory.newInstance();
+        final TransformerFactory transformerFactory = TransformerFactory.newInstance();
+        transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, StringUtils.EMPTY);
+        transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, StringUtils.EMPTY);
         transformerFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
-        Transformer transformer = transformerFactory.newTransformer(xsltSource);
+        final Transformer transformer = transformerFactory.newTransformer(xsltSource);
 
         transformer.setOutputProperty(OutputKeys.INDENT, "yes");
         transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
         transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
         transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
 
-        StringWriter writer = new StringWriter();
+        final StringWriter writer = new StringWriter();
         transformer.transform(new DOMSource(doc), new StreamResult(writer));
         return writer.toString().trim();
     }
@@ -220,7 +224,7 @@ public final class XmlTool {
      * @return the contents of the modified XML document as a String or null/empty if the modification failed.
      * @throws IOException, TransformerException, ParserConfigurationException, SAXException
      */
-    public static Optional<String> modifyElement(String xml, String elementTag, String newValue)
+    public static Optional<String> modifyElement(final String xml, final String elementTag, final String newValue)
             throws IOException, TransformerException, ParserConfigurationException, SAXException {
 
         if (xml == null || xml.isEmpty()) {
@@ -228,15 +232,15 @@ public final class XmlTool {
             return Optional.empty();
         }
 
-        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+        final DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
         dbFactory.setNamespaceAware(true);
         dbFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
         dbFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
-        DocumentBuilder db = dbFactory.newDocumentBuilder();
-        InputSource source = new InputSource(new StringReader(xml));
-        Document doc = db.parse(source);
+        final DocumentBuilder db = dbFactory.newDocumentBuilder();
+        final InputSource source = new InputSource(new StringReader(xml));
+        final Document doc = db.parse(source);
 
-        Node modNode = doc.getElementsByTagName(elementTag).item(0);
+        final Node modNode = doc.getElementsByTagName(elementTag).item(0);
         if (modNode == null) {
             // did not find the specified element to be modified, return empty
             // System.out.println("Did not find element tag " + elementTag + " in XML");
@@ -245,9 +249,12 @@ public final class XmlTool {
             modNode.setTextContent(newValue);
         }
 
-        TransformerFactory transformerFactory = TransformerFactory.newInstance();
-        Transformer transformer = transformerFactory.newTransformer();
-        StringWriter writer = new StringWriter();
+        final TransformerFactory transformerFactory = TransformerFactory.newInstance();
+        transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, StringUtils.EMPTY);
+        transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, StringUtils.EMPTY);
+
+        final Transformer transformer = transformerFactory.newTransformer();
+        final StringWriter writer = new StringWriter();
         transformer.transform(new DOMSource(doc), new StreamResult(writer));
         // return the modified String representation of the XML
         return Optional.of(writer.toString().trim());
index 02ac437..20b0dce 100644 (file)
   ============LICENSE_END=========================================================
   -->
 
-<configuration >
-  
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}||%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}||%X{Timer}|%msg%n</pattern>
-    </encoder>
-  </appender>
+<configuration>
 
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}||%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}||%X{Timer}|%msg%n
+            </pattern>
+        </encoder>
+    </appender>
 
-  <logger name="com.att.eelf.audit" level="info" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger>
-  
-  <logger name="com.att.eelf.metrics" level="info" additivity="false">
+    <logger name="com.att.eelf.audit" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="com.att.eelf.metrics" level="info" additivity="false">
         <appender-ref ref="STDOUT" />
-  </logger>
+    </logger>
 
-  <logger name="com.att.eelf.error" level="trace" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger> 
-       <logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false">
-               <appender-ref ref="STDOUT" />
-       </logger>
-  <root level="info">
-    <appender-ref ref="STDOUT" />
-  </root>
+    <logger name="com.att.eelf.error" level="trace" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+    <logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="org.reflections" level="ERROR" />
+    
+    <root level="info">
+        <appender-ref ref="STDOUT" />
+    </root>
 
 </configuration>
index 33c0415..6a61ed1 100644 (file)
@@ -15,7 +15,7 @@
     <camunda.bpm.assert.version>1.2</camunda.bpm.assert.version>
     <h2.version>1.4.196</h2.version>
     <groovy.version>2.5.3</groovy.version>
-    <saxon.version>9.5.1-8</saxon.version>
+    <saxon.version>10.5</saxon.version>
     <xmlunit.version>2.4.0</xmlunit.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
index c080bc9..c0b24d9 100644 (file)
@@ -27,5 +27,6 @@
   </root>
 
   <logger name="wiremock.org" level="DEBUG" />
+  <logger name="org.reflections" level="ERROR" />
 
 </configuration>
\ No newline at end of file
index 38a2ef6..7a8d2a1 100644 (file)
@@ -1,7 +1,5 @@
 <configuration>
 
-
-
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{HH:mm:ss.SSS} [%thread] |%X{RequestId}| %-5level
@@ -10,7 +8,6 @@
         </encoder>
     </appender>
 
-
     <logger name="com.att.ecomp.audit" level="info" additivity="false">
         <appender-ref ref="STDOUT" />
     </logger>
     <logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false">
         <appender-ref ref="STDOUT" />
     </logger>
-    
 
     <logger name="ch.vorburger" level="WARN" additivity="false">
         <appender-ref ref="STDOUT" />
     </logger>
-    
-    <logger name="AUDIT" level="info" additivity="true">        
+
+    <logger name="AUDIT" level="info" additivity="true">
         <appender-ref ref="STDOUT" />
     </logger>
 
+    <logger name="org.reflections" level="ERROR" />
+
     <root level="WARN">
         <appender-ref ref="STDOUT" />
     </root>
 
-
 </configuration>
\ No newline at end of file
index 3b0bdb2..6fbf09e 100644 (file)
@@ -45,6 +45,8 @@
   <logger name="AUDIT" level="info" additivity="true">
     <appender-ref ref="STDOUT"/>
   </logger>
+  
+  <logger name="org.reflections" level="ERROR" />
 
   <!-- suppress the amount of org.apache.tomcat.util.net.NioEndpoint log-->
   <logger name="org.apache.tomcat" level="WARN" />
index 8e6e867..7c6473f 100644 (file)
@@ -2,12 +2,15 @@ package org.onap.so.bpmn.infrastructure.adapter.network.tasks;
 
 import java.io.ByteArrayInputStream;
 import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
 import java.util.Optional;
+import javax.xml.XMLConstants;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import org.apache.commons.lang3.StringUtils;
 import org.onap.so.adapters.nwrest.CreateNetworkResponse;
 import org.onap.so.adapters.nwrest.DeleteNetworkResponse;
 import org.onap.so.adapters.nwrest.UpdateNetworkResponse;
@@ -22,6 +25,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.w3c.dom.Document;
 
 @Component
 public class NetworkAdapterImpl {
@@ -80,14 +84,16 @@ public class NetworkAdapterImpl {
         return unmarshaller.unmarshal(reader);
     }
 
-    protected Optional<String> findResponseType(String xmlString) {
+    protected Optional<String> findResponseType(final String xmlString) {
         try {
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-            DocumentBuilder builder = factory.newDocumentBuilder();
-            org.w3c.dom.Document doc;
-            doc = builder.parse(new ByteArrayInputStream(xmlString.getBytes("UTF-8")));
+            final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, StringUtils.EMPTY);
+            factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, StringUtils.EMPTY);
+
+            final DocumentBuilder builder = factory.newDocumentBuilder();
+            final Document doc = builder.parse(new ByteArrayInputStream(xmlString.getBytes(StandardCharsets.UTF_8)));
             return Optional.of(doc.getDocumentElement().getNodeName());
-        } catch (Exception e) {
+        } catch (final Exception e) {
             logger.error("Error Finding Response Type", e);
             return Optional.empty();
         }
index e55fa9e..7ed8447 100644 (file)
@@ -22,6 +22,7 @@ package org.onap.so.bpmn.infrastructure.sdnc.tasks;
 
 import java.io.StringReader;
 import java.io.StringWriter;
+import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.Transformer;
@@ -30,14 +31,15 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathFactory;
+import org.apache.commons.lang3.StringUtils;
 import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.onap.logging.filter.base.ONAPComponents;
 import org.onap.so.bpmn.infrastructure.sdnc.exceptions.SDNCErrorResponseException;
 import org.onap.so.client.exception.BadResponseException;
 import org.onap.so.client.exception.ExceptionBuilder;
 import org.onap.so.client.exception.MapperException;
 import org.onap.so.client.sdnc.SDNCClient;
 import org.onap.so.client.sdnc.beans.SDNCRequest;
-import org.onap.logging.filter.base.ONAPComponents;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,10 +49,17 @@ import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.PathNotFoundException;
+import net.sf.saxon.lib.NamespaceConstant;
+import net.sf.saxon.xpath.XPathFactoryImpl;
 
 @Component
 public class SDNCRequestTasks {
 
+    private static final String NET_SF_SAXON_XPATH_IMPL = "net.sf.saxon.xpath.XPathFactoryImpl";
+
+    private static final String XPATH_FACTORY_PROPERTY_NAME =
+            "javax.xml.xpath.XPathFactory:" + NamespaceConstant.OBJECT_MODEL_SAXON;
+
     private static final Logger logger = LoggerFactory.getLogger(SDNCRequestTasks.class);
 
     private static final String SDNC_REQUEST = "SDNCRequest";
@@ -143,14 +152,20 @@ public class SDNCRequestTasks {
         return "Y".equals(finalMessageIndicator);
     }
 
-    protected String getXmlElement(Document doc, String exp) throws Exception {
-        TransformerFactory tf = TransformerFactory.newInstance();
-        Transformer transformer = tf.newTransformer();
-        StringWriter writer = new StringWriter();
+    protected String getXmlElement(final Document doc, final String exp) throws Exception {
+        final TransformerFactory factory = TransformerFactory.newInstance();
+        factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, StringUtils.EMPTY);
+        factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, StringUtils.EMPTY);
+
+        final Transformer transformer = factory.newTransformer();
+        final StringWriter writer = new StringWriter();
         transformer.transform(new DOMSource(doc), new StreamResult(writer));
         logger.debug(writer.getBuffer().toString());
-        XPath xPath = XPathFactory.newInstance().newXPath();
-        String result = xPath.evaluate(exp, doc);
+
+        System.setProperty(XPATH_FACTORY_PROPERTY_NAME, NET_SF_SAXON_XPATH_IMPL);
+        final XPathFactory xPathFactory = XPathFactoryImpl.newInstance(NamespaceConstant.OBJECT_MODEL_SAXON);
+        final XPath xPath = xPathFactory.newXPath();
+        final String result = xPath.evaluate(exp, doc);
         if (result == null || result.isEmpty()) {
             throw new Exception("XPath Failed to find element expression: " + exp);
         }
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/logback-test.xml b/bpmn/so-bpmn-tasks/src/test/resources/logback-test.xml
new file mode 100644 (file)
index 0000000..bb4aee6
--- /dev/null
@@ -0,0 +1,36 @@
+<!--
+  ============LICENSE_START=======================================================
+  ONAP - SO
+  ================================================================================
+  Copyright (C) 2021 Nordix Foundation.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.reflections" level="ERROR" />
+    <logger name="org.onap" level="DEBUG" />
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
index 3c5f259..d0714bb 100644 (file)
@@ -68,6 +68,8 @@
   <logger name="org.reflections" level="ERROR" additivity="false">
     <appender-ref ref="STDOUT" />
   </logger>
+  
+  <logger name="org.reflections" level="ERROR" />
 
   <root level="WARN">
     <appender-ref ref="STDOUT" />
index 772eeab..28dd35f 100644 (file)
@@ -65,6 +65,7 @@
                <appender-ref ref="STDOUT" />
        </logger>
        
+    <logger name="org.reflections" level="ERROR" />
 
        <root level="WARN">
                <appender-ref ref="STDOUT" />
diff --git a/graph-inventory/aai-client/src/test/resources/logback-test.xml b/graph-inventory/aai-client/src/test/resources/logback-test.xml
new file mode 100644 (file)
index 0000000..bb4aee6
--- /dev/null
@@ -0,0 +1,36 @@
+<!--
+  ============LICENSE_START=======================================================
+  ONAP - SO
+  ================================================================================
+  Copyright (C) 2021 Nordix Foundation.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.reflections" level="ERROR" />
+    <logger name="org.onap" level="DEBUG" />
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
index 5e6b88c..23d31d0 100644 (file)
@@ -1,41 +1,38 @@
 <configuration>
 
-
-       <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-               <encoder>
-                       <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
-                       </pattern>
-               </encoder>
-       </appender>
-       <appender name="test" class="org.onap.so.apihandlerinfra.TestAppender" />
-
-
-       <logger name="AUDIT" level="info" additivity="false">
-               <appender-ref ref="STDOUT" />
-       </logger>
-
-       <logger name="com.att.eelf.metrics" level="info" additivity="false">
-               <appender-ref ref="STDOUT" />
-       </logger>
-
-       <logger name="com.att.eelf.error" level="ERROR" additivity="false">
-               <appender-ref ref="STDOUT" />
-       </logger>
-
-       <logger name="org.onap" level="${so.log.level:-DEBUG}"
-               additivity="false">
-               <appender-ref ref="STDOUT" />
-               <appender-ref ref="test" />
-       </logger>
-
-       <logger name="com.att" level="${so.log.level:-DEBUG}"
-               additivity="false">
-               <appender-ref ref="STDOUT" />
-       </logger>
-       <root level="WARN">
-               <appender-ref ref="STDOUT" />
-       </root>
-
-       <logger name="wiremock.org" level="ERROR" />
-
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+    <appender name="test" class="org.onap.so.apihandlerinfra.TestAppender" />
+
+
+    <logger name="AUDIT" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="com.att.eelf.metrics" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="com.att.eelf.error" level="ERROR" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="test" />
+    </logger>
+
+    <logger name="com.att" level="${so.log.level:-DEBUG}" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+    <root level="WARN">
+        <appender-ref ref="STDOUT" />
+    </root>
+
+    <logger name="wiremock.org" level="ERROR" />
+    <logger name="org.reflections" level="ERROR" />
 </configuration>
index 1951484..868583d 100644 (file)
@@ -1,46 +1,46 @@
-<configuration >
-  
-  
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-
-  <logger name="com.att.ecomp.audit" level="info" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger>
-  
-  <logger name="com.att.eelf.metrics" level="info" additivity="false">
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+
+    <logger name="com.att.ecomp.audit" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="com.att.eelf.metrics" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="com.att.eelf.error" level="trace" additivity="false">
         <appender-ref ref="STDOUT" />
-  </logger>
-
-  <logger name="com.att.eelf.error" level="trace" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger> 
-
-       <logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false">
-               <appender-ref ref="STDOUT" />
-       </logger>
-  <root level="debug">
-    <appender-ref ref="STDOUT" />
-  </root>
-  
-       <!-- Spring related loggers -->
-       <logger name="org.springframework" level="WARN" />
-       <logger name="org.springframework.beans" level="WARN" />
-       <logger name="org.springframework.web" level="WARN" />
-       <logger name="com.blog.spring.jms" level="WARN" />
-       
-       <logger name="org.hibernate" level="WARN" />
-
-       
-       <!-- Tomcat related loggers -->
-       <logger name="org.apache.tomcat.util.digester.Digester" level="WARN" />
-       <logger name="org.apache.tomcat.util.modeler.modules.*" level="WARN" />
-       <logger name="org.apache.tomcat.util.IntrospectionUtils" level="WARN" />
-       <logger name="org.apache.catalina.loader.WebappClassLoaderBase" level="WARN" />
-       <logger name="wiremock.org.eclipse.jetty" level="WARN" />
+    </logger>
+
+    <logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+    <root level="debug">
+        <appender-ref ref="STDOUT" />
+    </root>
+
+    <logger name="org.reflections" level="ERROR" />
+    <!-- Spring related loggers -->
+    <logger name="org.springframework" level="WARN" />
+    <logger name="org.springframework.beans" level="WARN" />
+    <logger name="org.springframework.web" level="WARN" />
+    <logger name="com.blog.spring.jms" level="WARN" />
+
+    <logger name="org.hibernate" level="WARN" />
+
+
+    <!-- Tomcat related loggers -->
+    <logger name="org.apache.tomcat.util.digester.Digester" level="WARN" />
+    <logger name="org.apache.tomcat.util.modeler.modules.*" level="WARN" />
+    <logger name="org.apache.tomcat.util.IntrospectionUtils" level="WARN" />
+    <logger name="org.apache.catalina.loader.WebappClassLoaderBase" level="WARN" />
+    <logger name="wiremock.org.eclipse.jetty" level="WARN" />
 
 </configuration>
\ No newline at end of file
index 1951484..607cbe9 100644 (file)
@@ -27,6 +27,8 @@
     <appender-ref ref="STDOUT" />
   </root>
   
+    <logger name="org.reflections" level="ERROR" />
+  
        <!-- Spring related loggers -->
        <logger name="org.springframework" level="WARN" />
        <logger name="org.springframework.beans" level="WARN" />
index 1407ad0..88f5f9a 100644 (file)
   ============LICENSE_END=========================================================
   -->
 
-<configuration >
+<configuration>
 
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}||%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}||%X{Timer}|%msg%n</pattern>
-    </encoder>
-  </appender>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}||%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}||%X{Timer}|%msg%n
+            </pattern>
+        </encoder>
+    </appender>
 
 
-  <logger name="com.att.eelf.audit" level="info" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger>
-  
-  <logger name="com.att.eelf.metrics" level="info" additivity="false">
+    <logger name="com.att.eelf.audit" level="info" additivity="false">
         <appender-ref ref="STDOUT" />
-  </logger>
+    </logger>
 
-  <logger name="com.att.eelf.error" level="trace" additivity="false">
-    <appender-ref ref="STDOUT" />
-  </logger>
-  
-       <logger name="org.onap" level="DEBUG" additivity="false">
-               <appender-ref ref="STDOUT" />
-       </logger>
-  <root level="info">
-    <appender-ref ref="STDOUT" />
-  </root>
+    <logger name="com.att.eelf.metrics" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="com.att.eelf.error" level="trace" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="org.onap" level="DEBUG" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="org.reflections" level="ERROR" />
+    
+    <root level="info">
+        <appender-ref ref="STDOUT" />
+    </root>
 
 </configuration>
diff --git a/so-sdn-clients/src/test/resources/logback-test.xml b/so-sdn-clients/src/test/resources/logback-test.xml
new file mode 100644 (file)
index 0000000..bb4aee6
--- /dev/null
@@ -0,0 +1,36 @@
+<!--
+  ============LICENSE_START=======================================================
+  ONAP - SO
+  ================================================================================
+  Copyright (C) 2021 Nordix Foundation.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.reflections" level="ERROR" />
+    <logger name="org.onap" level="DEBUG" />
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
index bbf07d9..b6e146a 100644 (file)
@@ -5,8 +5,10 @@ log4j.rootLogger=INFO, out
 
 log4j.logger.com.consol.citrus=DEBUG
 log4j.logger.org.springframework=INFO
+log4j.logger.org.reflections=ERROR
 
 # CONSOLE appender not used by default
 log4j.appender.out=org.apache.log4j.ConsoleAppender
 log4j.appender.out.layout=org.apache.log4j.PatternLayout
 log4j.appender.out.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5.5p %20.20c{2}| %m%n
+