Merge "schema-service processing for v19"

2 files changed, 92 insertions, 151 deletions

diff --git a/aai-schema-service/src/test/resources/etc/appprops/aaiconfig.properties b/aai-schema-service/src/test/resources/etc/appprops/aaiconfig.properties
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/aai-schema-service/src/test/resources/etc/appprops/aaiconfig.properties
diff --git a/aai-schema-service/src/test/resources/logback.xml b/aai-schema-service/src/test/resources/logback.xml
index 2dd8021..e18e358 100644
--- a/aai-schema-service/src/test/resources/logback.xml
+++ b/aai-schema-service/src/test/resources/logback.xml
@@ -31,14 +31,25 @@
     <property name="AJSC_HOME" value="${AJSC_HOME:-.}"/>
     <jmxConfigurator/>
     <property name="logDirectory" value="${AJSC_HOME}/logs"/>
-    <property name="eelfLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-    <property name="eelfAuditLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n|\r\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-    <property name="eelfMetricLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{targetVirtualEntity}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-    <!--  <property name="eelfErrorLogPattern" value="%ecompStartTime|%X{requestId}|%-10t|%X{serviceName}|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%ecompErrorCategory|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n|\r\n', '^'}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/> -->
-    <property name="eelfErrorLogPattern" value="%ecompStartTime|%X{requestId}|%-10t|%X{serviceName}|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%ecompErrorCategory|%ecompResponseCode|%ecompResponseDescription|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-    <property name="eelfTransLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{partnerName}:%m%n"/>
-
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+
+    <property name="p_tim" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}"/>
+    <property name="p_lvl" value="%level"/>
+    <property name="p_log" value="%logger"/>
+    <property name="p_mdc" value="%replace(%replace(%mdc){'\t','\\\\t'}){'\n', '\\\\n'}"/>
+    <property name="p_msg" value="%replace(%replace(%msg){'\t', '\\\\t'}){'\n','\\\\n'}"/>
+    <property name="p_exc" value="%replace(%replace(%rootException){'\t', '\\\\t'}){'\n','\\\\n'}"/>
+    <property name="p_mak" value="%replace(%replace(%marker){'\t', '\\\\t'}){'\n','\\\\n'}"/>
+    <property name="p_thr" value="%thread"/>
+    <property name="pattern" value="%nopexception${p_tim}\t${p_thr}\t${p_lvl}\t${p_log}\t${p_mdc}\t${p_msg}\t${p_exc}\t${p_mak}\t%n"/>
+    <!-- Patterns from onap demo -->
+    <property name="errorPattern" value="%X{LogTimestamp}|%X{RequestID}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDesc}|%msg%n" />
+    <property name="debugPattern" value="%X{LogTimestamp}|%X{RequestID}|%msg\t${p_mdc}\t${p_msg}\t${p_exc}\t${p_mak}\t|%n" />
+
+    <property name="auditPattern" value="%X{EntryTimestamp}|%X{LogTimestamp}|%X{RequestID}|%X{ServiceInstanceID}|%thread||%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}||||${p_mak}|${p_mdc}|||%msg%n" />
+    <property name="metricPattern" value="%X{InvokeTimestamp}|%X{LogTimestamp}|%X{RequestID}|%X{ServiceInstanceID}|%thread||%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}||||%X{TargetVirtualEntity}|${p_mak}|${p_mdc}|||%msg%n" />
+    <property name="transLogPattern" value="%X{LogTimestamp}|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{RequestID}|%X{ServiceInstanceID}|%-10t|%X{ServerFQDN}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%replace(%replace(%X{ResponseDesc}){'\\|', '!'}){'\r|\n', '^'}|%X{InstanceUUID}|%level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{clientIpAddress}||%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{PartnerName}:%m%n"/>
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+
     <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
     <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
@@ -68,18 +79,13 @@
 
     <appender name="METRIC"
               class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>INFO</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
         <file>${logDirectory}/rest/metrics.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd}
             </fileNamePattern>
         </rollingPolicy>
-        <encoder class="org.onap.aai.logging.EcompEncoder">
-            <pattern>${eelfMetricLogPattern}</pattern>
+        <encoder>
+            <pattern>${metricPattern}</pattern>
         </encoder>
     </appender>
     <appender name="asyncMETRIC" class="ch.qos.logback.classic.AsyncAppender">
@@ -100,8 +106,8 @@
             <fileNamePattern>${logDirectory}/rest/debug.log.%d{yyyy-MM-dd}
             </fileNamePattern>
         </rollingPolicy>
-        <encoder class="org.onap.aai.logging.EcompEncoder">
-            <pattern>${eelfLogPattern}</pattern>
+        <encoder>
+            <pattern>${debugPattern}</pattern>
         </encoder>
     </appender>
 
@@ -113,22 +119,21 @@
 
     <appender name="ERROR"
               class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>WARN</level>
-        </filter>
         <file>${logDirectory}/rest/error.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>${logDirectory}/rest/error.log.%d{yyyy-MM-dd}
             </fileNamePattern>
         </rollingPolicy>
-        <encoder class="org.onap.aai.logging.EcompEncoder">
-            <pattern>${eelfErrorLogPattern}</pattern>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+        <encoder>
+            <pattern>${errorPattern}</pattern>
         </encoder>
     </appender>
 
     <appender name="asyncERROR" class="ch.qos.logback.classic.AsyncAppender">
         <queueSize>1000</queueSize>
-        <includeCallerData>true</includeCallerData>
         <appender-ref ref="ERROR"/>
     </appender>
 
@@ -139,8 +144,8 @@
             <fileNamePattern>${logDirectory}/rest/audit.log.%d{yyyy-MM-dd}
             </fileNamePattern>
         </rollingPolicy>
-        <encoder class="org.onap.aai.logging.EcompEncoder">
-            <pattern>${eelfAuditLogPattern}</pattern>
+        <encoder>
+            <pattern>${auditPattern}</pattern>
         </encoder>
     </appender>
 
@@ -162,8 +167,8 @@
             <fileNamePattern>${logDirectory}/rest/translog.log.%d{yyyy-MM-dd}
             </fileNamePattern>
         </rollingPolicy>
-        <encoder class="org.onap.aai.logging.EcompEncoder">
-            <pattern>${eelfTransLogPattern}</pattern>
+        <encoder>
+            <pattern>${transLogPattern}</pattern>
         </encoder>
     </appender>
 
@@ -183,8 +188,8 @@
             <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/error.log.%d{yyyy-MM-dd}
             </fileNamePattern>
         </rollingPolicy>
-        <encoder class="org.onap.aai.logging.EcompEncoder">
-            <pattern>${eelfLogPattern}</pattern>
+        <encoder>
+            <pattern>${errorPattern}</pattern>
         </encoder>
     </appender>
 
@@ -200,10 +205,28 @@
             <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/debug.log.%d{yyyy-MM-dd}
             </fileNamePattern>
         </rollingPolicy>
-        <encoder class="org.onap.aai.logging.EcompEncoder">
-            <pattern>${eelfLogPattern}</pattern>
+        <encoder>
+            <pattern>${debugPattern}</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="dmaapAAIEventConsumerInfo"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <File>${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log.%d{yyyy-MM-dd}
+            </fileNamePattern>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${auditPattern}</pattern>
         </encoder>
     </appender>
+
     <appender name="dmaapAAIEventConsumerMetric"
               class="ch.qos.logback.core.rolling.RollingFileAppender">
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -216,8 +239,8 @@
             <fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/metrics.log.%d{yyyy-MM-dd}
             </fileNamePattern>
         </rollingPolicy>
-        <encoder class="org.onap.aai.logging.EcompEncoder">
-            <pattern>${eelfMetricLogPattern}</pattern>
+        <encoder>
+            <pattern>${metricPattern}</pattern>
         </encoder>
     </appender>
     <appender name="external"
@@ -230,139 +253,58 @@
             <fileNamePattern>${logDirectory}/external/external.log.%d{yyyy-MM-dd}
             </fileNamePattern>
         </rollingPolicy>
-        <encoder class="org.onap.aai.logging.EcompEncoder">
-            <pattern>${eelfLogPattern}</pattern>
+        <encoder>
+            <pattern>${debugPattern}</pattern>
         </encoder>
     </appender>
-    <logger name="org.onap.aai" level="DEBUG" additivity="true">
-        <appender-ref ref="asyncDEBUG"/>
-        <appender-ref ref="asyncERROR"/>
-        <appender-ref ref="asyncMETRIC"/>
-        <appender-ref ref="asyncSANE"/>
-    </logger>
+
+    <logger name="ch.qos.logback.classic" level="WARN" />
+    <logger name="ch.qos.logback.core" level="WARN" />
+
+    <logger name="com.att.aft.dme2" level="WARN" />
+    <logger name="com.jayway.jsonpath" level="WARN" />
+
+    <logger name="org.apache" level="OFF" />
+    <logger name="org.apache.commons" level="WARN" />
+    <logger name="org.apache.zookeeper" level="OFF" />
+    <logger name="org.codehaus.groovy" level="WARN" />
+    <logger name="org.eclipse.jetty" level="WARN" />
 
     <!-- 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="com.jayway.jsonpath" level="WARN"/>
-
-    <!-- AJSC Services (bootstrap services) -->
-    <logger name="ajsc" level="WARN"/>
-    <logger name="ajsc.RouteMgmtService" level="WARN"/>
-    <logger name="ajsc.ComputeService" level="WARN"/>
-    <logger name="ajsc.VandelayService" level="WARN"/>
-    <logger name="ajsc.FilePersistenceService" level="WARN"/>
-    <logger name="ajsc.UserDefinedJarService" level="WARN"/>
-    <logger name="ajsc.UserDefinedBeansDefService" level="WARN"/>
-    <logger name="ajsc.LoggingConfigurationService" level="WARN"/>
-
-    <!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet
-        logging) -->
-    <logger name="org.codehaus.groovy" level="WARN"/>
-    <logger name="com.att.scamper" level="WARN"/>
-    <logger name="ajsc.utils" level="WARN"/>
-    <logger name="ajsc.utils.DME2Helper" level="WARN"/>
-    <logger name="ajsc.filters" level="WARN"/>
-    <logger name="ajsc.beans.interceptors" level="WARN"/>
-    <logger name="ajsc.restlet" level="WARN"/>
-    <logger name="ajsc.servlet" level="WARN"/>
-    <logger name="com.att.ajsc" level="WARN"/>
-    <logger name="com.att.ajsc.csi.logging" level="WARN"/>
-    <logger name="com.att.ajsc.filemonitor" level="WARN"/>
-    <logger name="com.netflix.loadbalancer" level="WARN"/>
-
-    <logger name="org.apache.zookeeper" level="WARN"/>
-
-    <!-- Other Loggers that may help troubleshoot -->
-    <logger name="net.sf" level="WARN"/>
-    <logger name="org.apache.commons.httpclient" level="WARN"/>
-    <logger name="org.apache.commons" level="WARN"/>
-    <logger name="org.apache.coyote" level="WARN"/>
-    <logger name="org.apache.jasper" level="WARN"/>
-
-    <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging.
-        May aid in troubleshooting) -->
-    <logger name="org.apache.camel" level="WARN"/>
-    <logger name="org.apache.cxf" level="WARN"/>
-    <logger name="org.apache.camel.processor.interceptor" level="WARN"/>
-    <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN"/>
-    <logger name="org.apache.cxf.service" level="WARN"/>
-    <logger name="org.restlet" level="WARN"/>
-    <logger name="org.apache.camel.component.restlet" level="WARN"/>
-
-    <logger name="org.hibernate.validator" level="WARN"/>
-    <logger name="org.hibernate" level="WARN"/>
-    <logger name="org.hibernate.ejb" level="OFF"/>
-
-    <!-- logback internals logging -->
-    <logger name="ch.qos.logback.classic" level="WARN"/>
-    <logger name="ch.qos.logback.core" level="WARN"/>
+
+
+    <logger name="org.janusgraph" level="WARN" />
+    <logger name="org.zookeeper" level="OFF" />
+
 
     <logger name="org.eclipse.jetty" level="WARN"/>
 
-    <!-- logback jms appenders & loggers definition starts here -->
-    <appender name="auditLogs"
-              class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-        <file>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.log
-        </file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <fileNamePattern>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip
-            </fileNamePattern>
-            <minIndex>1</minIndex>
-            <maxIndex>9</maxIndex>
-        </rollingPolicy>
-        <triggeringPolicy
-            class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <maxFileSize>5MB</maxFileSize>
-        </triggeringPolicy>
-        <encoder>
-            <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-        </encoder>
-    </appender>
-    <appender name="perfLogs"
-              class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-        <file>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.log
-        </file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <fileNamePattern>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip
-            </fileNamePattern>
-            <minIndex>1</minIndex>
-            <maxIndex>9</maxIndex>
-        </rollingPolicy>
-        <triggeringPolicy
-            class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <maxFileSize>5MB</maxFileSize>
-        </triggeringPolicy>
-        <encoder>
-            <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-        </encoder>
-    </appender>
-    <logger name="AuditRecord" level="INFO" additivity="false">
-        <appender-ref ref="auditLogs"/>
+    <logger name="org.onap.aai" level="DEBUG" additivity="false">
+        <appender-ref ref="asyncDEBUG" />
+        <appender-ref ref="asyncSANE" />
+        <appender-ref ref="STDOUT" />
     </logger>
-    <logger name="AuditRecord_DirectCall" level="INFO" additivity="false">
-        <appender-ref ref="auditLogs"/>
+    <logger name="org.onap.aai.aailog.logs.AaiScheduledTaskAuditLog" level="INFO">
+        <appender-ref ref="asyncAUDIT"/>
     </logger>
-    <logger name="PerfTrackerRecord" level="INFO" additivity="false">
-        <appender-ref ref="perfLogs"/>
+    <logger name="org.onap.logging.filter.base.AbstractAuditLogFilter" level="INFO">
+        <appender-ref ref="asyncAUDIT"/>
     </logger>
     <!-- logback jms appenders & loggers definition ends here -->
 
-    <logger name="org.onap.aai.schemaservice.interceptors.post" level="DEBUG"
-            additivity="false">
-        <appender-ref ref="asynctranslog"/>
+    <logger name="org.onap.aai.aailog.logs.AaiDBMetricLog" level="INFO">
+        <appender-ref ref="asyncMETRIC"/>
     </logger>
 
-    <logger name="org.onap.aai.schemaservice.interceptors.pre.SetLoggingContext" level="DEBUG">
-        <appender-ref ref="asyncAUDIT"/>
+    <logger name="org.onap.aai.logging.ErrorLogHelper" level="WARN">
+        <appender-ref ref="asyncERROR"/>
     </logger>
 
-    <logger name="org.onap.aai.schemaservice.interceptors.post.ResetLoggingContext" level="DEBUG">
-        <appender-ref ref="asyncAUDIT"/>
+    <logger name="org.onap.aai.interceptors.post" level="DEBUG" additivity="false">
+        <appender-ref ref="asynctranslog" />
     </logger>
 
     <logger name="org.onap.aai.dmaap" level="DEBUG" additivity="false">
@@ -371,10 +313,9 @@
         <appender-ref ref="dmaapAAIEventConsumerMetric"/>
     </logger>
 
-    <logger name="org.apache" level="WARN"/>
-    <logger name="org.zookeeper" level="WARN"/>
-    <logger name="org.janusgraph" level="WARN"/>
-    <logger name="com.att.aft.dme2" level="WARN"/>
+    <logger name="com.att.nsa.mr" level="INFO" >
+        <appender-ref ref="dmaapAAIEventConsumerInfo" />
+    </logger>
 
     <!-- ============================================================================ -->
     <!-- General EELF logger -->