From a83fa219608559e1c9a82e4cfc5a345d6c3ec636 Mon Sep 17 00:00:00 2001
From: "Boslet, Cory" <cory.boslet@att.com>
Date: Mon, 26 Aug 2019 10:09:09 -0400
Subject: Added default value for when ErrorCode is null in

Added default value for when ErrorCode is null in mdc
test to see if 404 log gets enhanced by change.
Removed test id from class that was put to test via docker.
Removed setting of partner name and tested with using try/catch
Reverted change to request uri filter per comments
Removed the request filter uri class that rerouted old uri orders
Removed request filter from jersey config files
Updated junit test that were pointing to the old uri to be failure test
corrected formatting issues on ServiceInstancesTest

Issue-ID: SO-2259
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: Id8f9daef139a82ee9e934d4d37906ffb7a7aadff
---
 .../configs/logging/logback-spring.xml             | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'packages')

diff --git a/packages/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml b/packages/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml
index 89482fdcda..e1de3317e7 100644
--- a/packages/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml
+++ b/packages/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml
@@ -1,12 +1,12 @@
-<!-- ============LICENSE_START======================================================= 
-    ECOMP MSO ================================================================================ 
-    Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. ================================================================================ 
-    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 
+<!-- ============LICENSE_START=======================================================
+    ECOMP MSO ================================================================================
+    Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. ================================================================================
+    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. ============LICENSE_END========================================================= -->
 
 <configuration scan="true" debug="false">
@@ -23,11 +23,11 @@
 	<property name="metricsLogName" value="metrics" />
 	<property name="auditLogName" value="audit" />
 	<property name="debugLogName" value="debug" />
-	
+
 	<property name="currentTimeStamp" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;,UTC}"/>
 
 	<property name="errorPattern"
-		value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestID}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDesc}|%msg%n" />
+		value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestID}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode:-500}|%X{ErrorDesc}|%msg%n" />
 
 	<property name="debugPattern"
 		value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestID}| %logger{50} - %msg%n" />
@@ -52,7 +52,7 @@
 	<appender name="Audit"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-			<evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">				
+			<evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
 				<marker>EXIT</marker>
 			</evaluator>
 			<onMismatch>DENY</onMismatch>
@@ -80,7 +80,7 @@
 	<appender name="Metric"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-			<evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">				
+			<evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
 				<marker>INVOKE_RETURN</marker>
 			</evaluator>
 			<onMismatch>DENY</onMismatch>
-- 
cgit 1.2.3-korg