From 0c39fc9851639eed38eaa3a2d320442d8ce94d8d Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Thu, 10 Dec 2015 17:03:22 +0000
Subject: [PATCH] Fix API change from CAUD 4.0.0
---
opendj-server-legacy/src/main/java/org/opends/server/protocols/http/CommonAuditHttpAccessAuditFilter.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/CommonAuditHttpAccessAuditFilter.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/CommonAuditHttpAccessAuditFilter.java
index d18500e..39b7ad2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/CommonAuditHttpAccessAuditFilter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/CommonAuditHttpAccessAuditFilter.java
@@ -44,7 +44,6 @@
import org.forgerock.services.context.ClientContext;
import org.forgerock.services.context.Context;
import org.forgerock.services.context.RequestAuditContext;
-import org.forgerock.services.context.TransactionIdContext;
import org.forgerock.util.promise.NeverThrowsException;
import org.forgerock.util.promise.Promise;
import org.forgerock.util.promise.PromiseImpl;
@@ -81,7 +80,6 @@
@Override
public Promise<Response, NeverThrowsException> filter(Context context, Request request, Handler next) {
- TransactionIdContext txContext = context.asContext(TransactionIdContext.class);
ClientContext clientContext = context.asContext(ClientContext.class);
AccessAuditEventBuilder<?> accessAuditEventBuilder = accessEvent();
@@ -90,11 +88,9 @@
accessAuditEventBuilder
.eventName(productName + "-" + protocol + "-ACCESS")
.timestamp(time.now())
- .transactionId(txContext.getTransactionId().getValue())
+ .transactionIdFromContext(context)
.serverFromContext(clientContext)
- .client(clientContext.getRemoteAddress(),
- clientContext.getRemotePort(),
- clientContext.getRemoteHost())
+ .clientFromContext(clientContext)
.httpRequest(clientContext.isSecure(),
request.getMethod(),
getRequestPath(request.getUri()),
--
Gitblit v1.10.0