From a41662c1136b2bb4a4198df89e0e87d2be3ef099 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 16 Jul 2015 14:57:56 +0000
Subject: [PATCH] AutoRefactor'ed simplify expressions
---
opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
index 3246ad4..baf6e7e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
@@ -116,7 +116,7 @@
currentConfig.getMatchAttribute().toArray(new AttributeType[0]);
Set<DN> cfgBaseDNs = configuration.getMatchBaseDN();
- if ((cfgBaseDNs == null) || cfgBaseDNs.isEmpty())
+ if (cfgBaseDNs == null || cfgBaseDNs.isEmpty())
{
cfgBaseDNs = DirectoryServer.getPublicNamingContexts().keySet();
}
@@ -126,7 +126,7 @@
for (DN baseDN : cfgBaseDNs)
{
Backend b = DirectoryServer.getBackend(baseDN);
- if ((b != null) && (! b.isIndexed(t, IndexType.EQUALITY)))
+ if (b != null && ! b.isIndexed(t, IndexType.EQUALITY))
{
throw new ConfigException(ERR_EXACTMAP_ATTR_UNINDEXED.get(
configuration.dn(), t.getNameOrOID(), b.getBackendID()));
@@ -201,7 +201,7 @@
// then use size and time limits to constrain costly searches resulting from
// non-unique or inefficient criteria.
Collection<DN> baseDNs = config.getMatchBaseDN();
- if ((baseDNs == null) || baseDNs.isEmpty())
+ if (baseDNs == null || baseDNs.isEmpty())
{
baseDNs = DirectoryServer.getPublicNamingContexts().keySet();
}
@@ -246,9 +246,8 @@
throw new DirectoryException(internalSearch.getResultCode(), message);
}
- LinkedList<SearchResultEntry> searchEntries =
- internalSearch.getSearchEntries();
- if ((searchEntries != null) && (! searchEntries.isEmpty()))
+ LinkedList<SearchResultEntry> searchEntries = internalSearch.getSearchEntries();
+ if (searchEntries != null && ! searchEntries.isEmpty())
{
if (matchingEntry == null)
{
@@ -296,7 +295,7 @@
// Make sure that all of the configured attributes are indexed for equality
// in all appropriate backends.
Set<DN> cfgBaseDNs = configuration.getMatchBaseDN();
- if ((cfgBaseDNs == null) || cfgBaseDNs.isEmpty())
+ if (cfgBaseDNs == null || cfgBaseDNs.isEmpty())
{
cfgBaseDNs = DirectoryServer.getPublicNamingContexts().keySet();
}
@@ -306,7 +305,7 @@
for (DN baseDN : cfgBaseDNs)
{
Backend b = DirectoryServer.getBackend(baseDN);
- if ((b != null) && (! b.isIndexed(t, IndexType.EQUALITY)))
+ if (b != null && ! b.isIndexed(t, IndexType.EQUALITY))
{
unacceptableReasons.add(ERR_EXACTMAP_ATTR_UNINDEXED.get(
configuration.dn(), t.getNameOrOID(), b.getBackendID()));
--
Gitblit v1.10.0