From 5ae697173eec0227912b95b7fb51e28e30e41e88 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 21 Oct 2014 10:49:04 +0000
Subject: [PATCH] AutoRefactored boolean conditions
---
opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Context.java | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Context.java b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Context.java
index 9ba7cc4..36f9d0c 100644
--- a/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Context.java
+++ b/opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Context.java
@@ -143,22 +143,11 @@
boolean isMatchingRead(final SearchRequest request) {
// Cached reads are always base object.
- if (!request.getScope().equals(SearchScope.BASE_OBJECT)) {
- return false;
- }
-
- // Filters must match.
- if (!request.getFilter().toString().equals(cachedFilterString)) {
- return false;
- }
-
- // List of requested attributes must match.
- if (!request.getAttributes().equals(cachedRequest.getAttributes())) {
- return false;
- }
-
- // Don't need to check anything else.
- return true;
+ return request.getScope().equals(SearchScope.BASE_OBJECT)
+ // Filters must match.
+ && request.getFilter().toString().equals(cachedFilterString)
+ // List of requested attributes must match.
+ && request.getAttributes().equals(cachedRequest.getAttributes());
}
void setPromise(final LdapPromise<Result> promise) {
--
Gitblit v1.10.0