From b48ea0e307f5977b5d2b9dcc4ebb22a7bc3f1710 Mon Sep 17 00:00:00 2001
From: PawelSzalapski <pawel.szalapski@nokia.com>
Date: Tue, 5 Jun 2018 10:54:27 +0200
Subject: Fix bug about custom exceptions not being used

The bug was that custom exception config was never actually queried
because of the mismatch between the production code usages and .json config file.

Change-Id: I416ef5f45770f9bb55d5dff143277b6c62fa25ba
Issue-ID: DCAEGEN2-518
Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com>
---
 etc/ExceptionConfig.json | 42 ------------------------------------------
 etc/collector.properties |  3 ---
 2 files changed, 45 deletions(-)
 delete mode 100644 etc/ExceptionConfig.json

(limited to 'etc')

diff --git a/etc/ExceptionConfig.json b/etc/ExceptionConfig.json
deleted file mode 100644
index 1345cdcd..00000000
--- a/etc/ExceptionConfig.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"code" : {
-	  "200" : 
-	  	[
-	  		{
-			"Reason" : "OK",
-			"ErrorCode": ["OK","Event message has been accepted"]
-			}
-	         ],
-
-	  "204": [ 
-	  		{
-			"Reason" : "Accepted",
-			"ErrorCode": ["OK","Event message has been accepted"]
-			}
-		],
-       	   "400" :  
-       	   	[ 
-	       	   	{
-	    			"Reason" : "BadParameter",
-					"ErrorCode": ["SVC0002","Bad Parameter"	]
-				},
-				
-				{
-					"Reason" : "Error",
-					"ErrorCode": ["SVC2000","General Service Error with details"]
-				},
-				{
-					"Reason" : "exceeded",
-					"ErrorCode": ["POL9003","Message content size exceeded"	]
-				}
-		
-		 ],
-	    "401" : 
-	    	[
-	    		{
-					"Reason" : "Unauthorized",
-					"ErrorCode": ["POL2000","Unauthorized user"]
-			}
-		]
-	}				
-}
\ No newline at end of file
diff --git a/etc/collector.properties b/etc/collector.properties
index ab5febc5..67c6d39c 100755
--- a/etc/collector.properties
+++ b/etc/collector.properties
@@ -49,9 +49,6 @@ collector.schema.file={\"v1\":\"./etc/CommonEventFormat_27.2.json\",\"v2\":\"./e
 collector.dmaap.streamid=fault=ves_fault|syslog=ves_syslog|heartbeat=ves_heartbeat|measurementsForVfScaling=ves_measurement|mobileFlow=ves_mobileflow|other=ves_other|stateChange=ves_statechange|thresholdCrossingAlert=ves_thresholdCrossingAlert|voiceQuality=ves_voicequality|sipSignaling=ves_sipsignaling
 collector.dmaapfile=./etc/DmaapConfig.json
 
-## Custom ExceptionConfiguration
-exceptionConfig=./etc/ExceptionConfig.json
-
 ## authflag control authentication by the collector
 ## If enabled (1) - then authlist has to be defined
 ## When authflag is enabled, only secure port will be supported
-- 
cgit 1.2.3-korg