BugFix:X-FromAppId configurable in AAiDataRouter

Issue-ID: LOG-697
Change-Id: I4edced8bd84696b522fcd612430b99a955294203
Signed-off-by: Phillip Leigh <phillip.leigh@amdocs.com>

diff --git a/src/main/java/org/onap/aai/datarouter/service/AuditService.java b/src/main/java/org/onap/aai/datarouter/service/AuditService.java
index a0ab83c..784fbd4 100644 (file)
--- a/src/main/java/org/onap/aai/datarouter/service/AuditService.java
+++ b/src/main/java/org/onap/aai/datarouter/service/AuditService.java
@@ -50,15 +50,12 @@ import org.onap.aai.event.api.EventPublisher;
 import org.onap.aai.datarouter.util.DataRouterConstants;\r
 import org.onap.aai.restclient.client.Headers;\r
 \r
-\r
-\r
 public class AuditService {\r
 \r
     private static Logger logger = LoggerFactory.getInstance().getLogger(AuditService.class.getName());\r
     private static Logger auditLogger = LoggerFactory.getInstance().getAuditLogger(AuditService.class.getName());\r
 \r
     private static final String MEDIA_TYPE = MediaType.APPLICATION_JSON;\r
-    private static final String DATA_ROUTER_APP = "Data-Router";\r
     private static final String UNKNOWN_APP = "[unknown_app_id]";\r
     private static final String RESULT_OK = "200 OK";\r
 \r
@@ -164,14 +161,13 @@ public class AuditService {
         List<String> eventMessages = new ArrayList<String>();\r
         for (POAServiceInstanceEntity serviceInstance: auditEvent.getServiceInstanceList()) {\r
             serviceInstance.validate();\r
-            serviceInstance.setxFromAppId(DATA_ROUTER_APP);\r
+            serviceInstance.setxFromAppId(eventHeaders.get(Headers.FROM_APP_ID));\r
             serviceInstance.setxTransactionId(eventHeaders.get(Headers.TRANSACTION_ID));\r
             eventMessages.add(serviceInstance.toJson());\r
         }\r
         return eventMessages;\r
     }\r
 \r
-\r
     /**\r
      * Publish events to DMaaP.\r
      * @param eventMessages\r

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 13ba49c..5724b46 100644 (file)
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,6 +1,5 @@
 camel.springboot.xmlRoutes=file:${DYNAMIC_ROUTES}/*.route
 server.ssl.key-store=file:${CONFIG_HOME}/auth/tomcat_keystore
-
 server.ssl.enabled=true
 server.port=9502
 server.ssl.client-auth=need