diff options
-rw-r--r-- | src/main/java/org/onap/aai/datarouter/service/AuditService.java | 6 | ||||
-rw-r--r-- | src/main/resources/application.properties | 1 |
2 files changed, 1 insertions, 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<String> eventMessages = new ArrayList<String>();
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 |