From ca669ae54f86dbeea277280690584d9f591c7571 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 18 Feb 2015 07:26:26 +0000
Subject: [PATCH] AutoRefactor: collapse if statements
---
opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java | 52 +++++++++++++++++-----------------------------------
1 files changed, 17 insertions(+), 35 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
index 7634c39..8309997 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
@@ -344,12 +344,10 @@
private boolean filterRequest(final Operation operation)
{
// Check target DN.
- if (targetDNNotEqualTo.length > 0 || targetDNEqualTo.length > 0)
+ if ((targetDNNotEqualTo.length > 0 || targetDNEqualTo.length > 0)
+ && !filterRequestTargetDN(operation))
{
- if (!filterRequestTargetDN(operation))
- {
- return false;
- }
+ return false;
}
// TODO: check required controls.
@@ -485,21 +483,15 @@
final long etime = operation.getProcessingTime();
final Integer etimeGT = cfg.getResponseEtimeGreaterThan();
- if (etimeGT != null)
+ if (etimeGT != null && etime <= ((long) etimeGT))
{
- if (etime <= ((long) etimeGT))
- {
- return false;
- }
+ return false;
}
final Integer etimeLT = cfg.getResponseEtimeLessThan();
- if (etimeLT != null)
+ if (etimeLT != null && etime >= ((long) etimeLT))
{
- if (etime >= ((long) etimeLT))
- {
- return false;
- }
+ return false;
}
// Check search response fields.
@@ -538,21 +530,15 @@
final int nentries = searchOperation.getEntriesSent();
final Integer nentriesGT = cfg.getSearchResponseNentriesGreaterThan();
- if (nentriesGT != null)
+ if (nentriesGT != null && nentries <= nentriesGT)
{
- if (nentries <= nentriesGT)
- {
- return false;
- }
+ return false;
}
final Integer nentriesLT = cfg.getSearchResponseNentriesLessThan();
- if (nentriesLT != null)
+ if (nentriesLT != null && nentries >= nentriesLT)
{
- if (nentries >= nentriesLT)
- {
- return false;
- }
+ return false;
}
}
@@ -564,21 +550,17 @@
private boolean filterUser(final ClientConnection connection)
{
// Check user DN.
- if (userDNNotEqualTo.length > 0 || userDNEqualTo.length > 0)
+ if ((userDNNotEqualTo.length > 0 || userDNEqualTo.length > 0)
+ && !filterUserBindDN(connection))
{
- if (!filterUserBindDN(connection))
- {
- return false;
- }
+ return false;
}
// Check group membership.
- if (userIsNotMemberOf.length > 0 || userIsMemberOf.length > 0)
+ if ((userIsNotMemberOf.length > 0 || userIsMemberOf.length > 0)
+ && !filterUserIsMemberOf(connection))
{
- if (!filterUserIsMemberOf(connection))
- {
- return false;
- }
+ return false;
}
return true;
--
Gitblit v1.10.0