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/tools/LDAPSearch.java | 31 ++++++++++++-------------------
1 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
index e0e218d..71f9d9a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPSearch.java
@@ -437,7 +437,7 @@
}
int dnLength = dnString.length();
- if ((dnLength <= colsRemaining) || (colsRemaining <= 0))
+ if (dnLength <= colsRemaining || colsRemaining <= 0)
{
buffer.append(dnString);
buffer.append(EOL);
@@ -448,13 +448,13 @@
buffer.append(EOL);
int startPos = colsRemaining;
- while ((dnLength - startPos) > (wrapColumn - 1))
+ while (dnLength - startPos > wrapColumn - 1)
{
buffer.append(" ");
- buffer.append(dnString, startPos, (startPos+wrapColumn-1));
+ buffer.append(dnString, startPos, startPos+wrapColumn-1);
buffer.append(EOL);
- startPos += (wrapColumn-1);
+ startPos += wrapColumn-1;
}
if (startPos < dnLength)
@@ -500,7 +500,7 @@
}
int valueLength = valueString.length();
- if ((valueLength <= colsRemaining) || (colsRemaining <= 0))
+ if (valueLength <= colsRemaining || colsRemaining <= 0)
{
buffer.append(valueString);
buffer.append(EOL);
@@ -510,13 +510,13 @@
buffer.append(EOL);
int startPos = colsRemaining;
- while ((valueLength - startPos) > (wrapColumn - 1))
+ while (valueLength - startPos > wrapColumn - 1)
{
buffer.append(" ");
- buffer.append(valueString, startPos, (startPos+wrapColumn-1));
+ buffer.append(valueString, startPos, startPos+wrapColumn-1);
buffer.append(EOL);
- startPos += (wrapColumn-1);
+ startPos += wrapColumn-1;
}
if (startPos < valueLength)
@@ -1247,13 +1247,8 @@
err.println(wrapText(ex1.getMessage(), MAX_LINE_WIDTH));
return CLIENT_SIDE_PARAM_ERROR;
}
- boolean val = searchOptions.setSearchScope(searchScope.getValue(), err);
- if(val == false)
- {
- return CLIENT_SIDE_PARAM_ERROR;
- }
- val = searchOptions.setDereferencePolicy(dereferencePolicy.getValue(), err);
- if(val == false)
+ if (!searchOptions.setSearchScope(searchScope.getValue(), err)
+ || !searchOptions.setDereferencePolicy(dereferencePolicy.getValue(), err))
{
return CLIENT_SIDE_PARAM_ERROR;
}
@@ -1551,15 +1546,13 @@
{
if(saslOption.startsWith("mech="))
{
- boolean mechValue = connectionOptions.setSASLMechanism(saslOption);
- if(mechValue == false)
+ if (!connectionOptions.setSASLMechanism(saslOption))
{
return CLIENT_SIDE_PARAM_ERROR;
}
} else
{
- boolean propValue = connectionOptions.addSASLProperty(saslOption);
- if(propValue == false)
+ if (!connectionOptions.addSASLProperty(saslOption))
{
return CLIENT_SIDE_PARAM_ERROR;
}
--
Gitblit v1.10.0