From 433e096bf98a35edaedc8760346a611dd7c0fee3 Mon Sep 17 00:00:00 2001 From: Phillip Leigh Date: Wed, 26 Sep 2018 17:41:30 -0400 Subject: [PATCH] BugFix:X-FromAppId configurable in AAiDataRouter Issue-ID: LOG-697 Change-Id: I4edced8bd84696b522fcd612430b99a955294203 Signed-off-by: Phillip Leigh --- src/main/java/org/onap/aai/datarouter/service/AuditService.java | 6 +----- src/main/resources/application.properties | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) 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 --- 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; import org.onap.aai.restclient.client.Headers; - - public class AuditService { private static Logger logger = LoggerFactory.getInstance().getLogger(AuditService.class.getName()); private static Logger auditLogger = LoggerFactory.getInstance().getAuditLogger(AuditService.class.getName()); private static final String MEDIA_TYPE = MediaType.APPLICATION_JSON; - private static final String DATA_ROUTER_APP = "Data-Router"; private static final String UNKNOWN_APP = "[unknown_app_id]"; private static final String RESULT_OK = "200 OK"; @@ -164,14 +161,13 @@ public class AuditService { List eventMessages = new ArrayList(); for (POAServiceInstanceEntity serviceInstance: auditEvent.getServiceInstanceList()) { serviceInstance.validate(); - serviceInstance.setxFromAppId(DATA_ROUTER_APP); + serviceInstance.setxFromAppId(eventHeaders.get(Headers.FROM_APP_ID)); serviceInstance.setxTransactionId(eventHeaders.get(Headers.TRANSACTION_ID)); eventMessages.add(serviceInstance.toJson()); } return eventMessages; } - /** * Publish events to DMaaP. * @param eventMessages diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 13ba49c..5724b46 100644 --- 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 -- 2.16.6