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-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Controls.java | 5 --
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java | 14 +-----
opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/PropertySet.java | 6 +--
opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandler.java | 5 --
opendj-sdk/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Context.java | 21 ++--------
opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java | 7 ---
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java | 10 +----
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java | 2
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java | 1
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java | 3 -
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java | 1
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java | 15 ++-----
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java | 8 +---
opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ExtendedOperations.java | 5 --
14 files changed, 24 insertions(+), 79 deletions(-)
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java
index d80a801..9e9eb36 100644
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java
@@ -600,12 +600,8 @@
TableBuilder nbuilder = new TableBuilder();
Map<String, MenuCallback<T>> callbacks = new HashMap<String, MenuCallback<T>>();
- // Determine whether multiple columns should be used for numeric
- // options.
- boolean useMultipleColumns = false;
- if (threshold >= 0 && numericCallbacks.size() >= threshold) {
- useMultipleColumns = true;
- }
+ // Determine whether multiple columns should be used for numeric options
+ boolean useMultipleColumns = threshold >= 0 && numericCallbacks.size() >= threshold;
// Create optional column headers.
if (!columnHeadings.isEmpty()) {
diff --git a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/PropertySet.java b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/PropertySet.java
index ed4a4fa..552d6e9 100644
--- a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/PropertySet.java
+++ b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/PropertySet.java
@@ -142,10 +142,8 @@
/** {@inheritDoc} */
@Override
public boolean isModified() {
- if (activeValues.size() == pendingValues.size() && activeValues.containsAll(pendingValues)) {
- return false;
- }
- return true;
+ return activeValues.size() != pendingValues.size()
+ || !activeValues.containsAll(pendingValues);
}
/**
diff --git a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
index 20a8508..6c6834f 100644
--- a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
+++ b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
@@ -1970,12 +1970,7 @@
// Create an option for editing/viewing each property.
for (PropertyDefinition<?> pd : c) {
// Determine whether this property should be modifiable.
- boolean isReadOnly = false;
-
- if (pd.hasOption(PropertyOption.MONITORING)) {
- isReadOnly = true;
- }
-
+ boolean isReadOnly = pd.hasOption(PropertyOption.MONITORING);
if (!isCreate && pd.hasOption(PropertyOption.READ_ONLY)) {
isReadOnly = true;
}
diff --git a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandler.java b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandler.java
index 39951b6..573ce31 100644
--- a/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandler.java
+++ b/opendj-sdk/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SubCommandHandler.java
@@ -926,10 +926,7 @@
* @return Returns <code>true</code> if the user requested record-mode.
*/
protected final boolean isRecordMode() {
- if (recordModeArgument != null) {
- return recordModeArgument.isPresent();
- }
- return false;
+ return recordModeArgument != null && recordModeArgument.isPresent();
}
/**
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java
index e53a04f..248de9e 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java
@@ -87,7 +87,6 @@
&& !needFirstLengthByteState(false)) {
return false;
}
-
return peekLength <= reader.remaining();
}
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java
index ae0c4de..001861d 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java
@@ -102,7 +102,6 @@
&& !needAdditionalLengthBytesState(false, false)) {
return false;
}
-
return peekLength <= in.available();
}
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java
index 5f8d4f7..e9a0aaa 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java
@@ -673,8 +673,7 @@
final MatchingRule rule = attributeType.getEqualityMatchingRule();
if (rule != null) {
final Comparator<ByteSequence> comparator = rule.comparator();
- return comparator.compare(normalizedValue, otherNormalizedValue) != 0 ? false
- : true;
+ return comparator.compare(normalizedValue, otherNormalizedValue) == 0;
} else {
return normalizedValue.equals(otherNormalizedValue);
}
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java
index 6ad1ba4..b8b2c3c 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java
@@ -62,22 +62,14 @@
if (attribute == object) {
return true;
}
-
if (!(object instanceof Attribute)) {
return false;
}
final Attribute other = (Attribute) object;
- if (!attribute.getAttributeDescription().equals(other.getAttributeDescription())) {
- return false;
- }
-
- // Attribute description is the same, compare values.
- if (attribute.size() != other.size()) {
- return false;
- }
-
- return attribute.containsAll(other);
+ return attribute.getAttributeDescription().equals(other.getAttributeDescription())
+ && attribute.size() == other.size()
+ && attribute.containsAll(other);
}
/**
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java
index c894f66..04207af 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java
@@ -602,17 +602,10 @@
}
}
} else {
- final RequestContextImpl<R, ResultHandler<R>> requestContext;
- if (request.getOID().equals(StartTLSExtendedRequest.OID)) {
- // StartTLS requests cannot be cancelled.
- requestContext =
- new RequestContextImpl<R, ResultHandler<R>>(this, resultHandler,
- messageID, false);
- } else {
- requestContext =
- new RequestContextImpl<R, ResultHandler<R>>(this, resultHandler,
- messageID, true);
- }
+ // StartTLS requests cannot be cancelled.
+ boolean isCancelSupported = !request.getOID().equals(StartTLSExtendedRequest.OID);
+ final RequestContextImpl<R, ResultHandler<R>> requestContext =
+ new RequestContextImpl<R, ResultHandler<R>>(this, resultHandler, messageID, isCancelSupported);
if (addPendingRequest(requestContext)) {
requestHandler.handleExtendedRequest(requestContext, request,
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java
index dc39d9e..484b68c 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java
@@ -457,7 +457,7 @@
* {@code false} if this control is using a target assertion.
*/
public boolean hasTargetOffset() {
- return assertionValue != null ? false : true;
+ return assertionValue == null;
}
/** {@inheritDoc} */
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java
index d46a664..1d259ce 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java
@@ -132,14 +132,8 @@
return false;
}
- // The closing curly brace must not be the last character of the
- // password.
- if (closingBracePos == value.length() - 1) {
- return false;
- }
-
- // If we've gotten here, then it looks to be encoded.
- return true;
+ // The closing curly brace must not be the last character of the password
+ return closingBracePos != value.length() - 1;
}
@Override
diff --git a/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Controls.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Controls.java
index dd4d8c7..a5d5d1b 100644
--- a/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Controls.java
+++ b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Controls.java
@@ -1083,10 +1083,7 @@
* @return True if the control is supported.
*/
static boolean isSupported(final String control) {
- if (controls != null && !controls.isEmpty()) {
- return controls.contains(control);
- }
- return false;
+ return controls != null && controls.contains(control);
}
// --- JCite check support ---
diff --git a/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ExtendedOperations.java b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ExtendedOperations.java
index b6e9bd0..6f36b3a 100644
--- a/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ExtendedOperations.java
+++ b/opendj-sdk/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ExtendedOperations.java
@@ -194,10 +194,7 @@
* @return True if the control is supported.
*/
static boolean isSupported(final String extendedOperation) {
- if (extendedOperations != null && !extendedOperations.isEmpty()) {
- return extendedOperations.contains(extendedOperation);
- }
- return false;
+ return extendedOperations != null && extendedOperations.contains(extendedOperation);
}
// --- JCite check support ---
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