From 609288638ae3e80ac92b36bba51551cb62830c2f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 29 Jan 2015 15:13:38 +0000
Subject: [PATCH] AutoRefactor'ed code cleanups
---
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java | 2
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java | 21 +++-------
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java | 9 ++--
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java | 7 +--
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java | 13 ++----
opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java | 15 +++----
opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java | 4 +-
7 files changed, 27 insertions(+), 44 deletions(-)
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 0fd941a..0b517d2 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
@@ -75,19 +75,14 @@
/** {@inheritDoc} */
public boolean elementAvailable() throws IOException {
- if ((state == ASN1.ELEMENT_READ_STATE_NEED_TYPE) && !needTypeState(false)) {
- return false;
- }
- if ((state == ASN1.ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE)
- && !needFirstLengthByteState(false)) {
- return false;
- }
- return peekLength <= reader.remaining();
+ return (state != ASN1.ELEMENT_READ_STATE_NEED_TYPE || needTypeState(false))
+ && (state != ASN1.ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE || needFirstLengthByteState(false))
+ && peekLength <= reader.remaining();
}
/** {@inheritDoc} */
public boolean hasNextElement() throws IOException {
- return (state != ASN1.ELEMENT_READ_STATE_NEED_TYPE) || needTypeState(false);
+ return state != ASN1.ELEMENT_READ_STATE_NEED_TYPE || needTypeState(false);
}
/** {@inheritDoc} */
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 320c7e3..0de13a5 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
@@ -84,18 +84,11 @@
/** {@inheritDoc} */
public boolean elementAvailable() throws IOException {
- if ((state == ASN1.ELEMENT_READ_STATE_NEED_TYPE) && !needTypeState(false, false)) {
- return false;
- }
- if ((state == ASN1.ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE)
- && !needFirstLengthByteState(false, false)) {
- return false;
- }
- if ((state == ASN1.ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES)
- && !needAdditionalLengthBytesState(false, false)) {
- return false;
- }
- return peekLength <= in.available();
+ return (state != ASN1.ELEMENT_READ_STATE_NEED_TYPE || needTypeState(false, false))
+ && (state != ASN1.ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE || needFirstLengthByteState(false, false))
+ && (state != ASN1.ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES
+ || needAdditionalLengthBytesState(false, false))
+ && peekLength <= in.available();
}
/** {@inheritDoc} */
@@ -105,10 +98,10 @@
// haven't exhausted the size limit for the sub sequence sub input
// stream.
final SizeLimitInputStream subSq = (SizeLimitInputStream) in;
- return (subSq.getSizeLimit() - subSq.getBytesRead() > 0);
+ return subSq.getSizeLimit() - subSq.getBytesRead() > 0;
}
- return (state != ASN1.ELEMENT_READ_STATE_NEED_TYPE) || needTypeState(true, false);
+ return state != ASN1.ELEMENT_READ_STATE_NEED_TYPE || needTypeState(true, false);
}
/** {@inheritDoc} */
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java
index a597cb5..7bcbb51 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java
@@ -475,11 +475,10 @@
boolean schemaValidationFailure = false;
final List<LocalizableMessage> schemaErrors = new LinkedList<LocalizableMessage>();
- if (lastLDIFLine != null) {
- // This line was read when looking for the change type.
- if (!readLDIFRecordAttributeValue(record, lastLDIFLine, entry, schemaErrors)) {
- schemaValidationFailure = true;
- }
+ if (lastLDIFLine != null
+ // This line was read when looking for the change type.
+ && !readLDIFRecordAttributeValue(record, lastLDIFLine, entry, schemaErrors)) {
+ schemaValidationFailure = true;
}
while (record.iterator.hasNext()) {
diff --git a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java
index 80b2ee4..1e04af3 100644
--- a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java
+++ b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java
@@ -1087,8 +1087,8 @@
assertThat(Integer.signum(cmp)).isEqualTo(expectedCompareResult);
}
+ /** Additional tests with testDNs data provider. */
@Test(dataProvider = "testDNs")
- /** Additional tests with testDNs data provider */
public void testToIrreversibleNormalizedByteString2(String one, String two, String three) {
DN dn1 = DN.valueOf(one);
DN dn2 = DN.valueOf(two);
@@ -1139,8 +1139,8 @@
assertEquals(actual.toIrreversibleReadableString(), expectedReadableString);
}
+ /** Additional tests with testDNs data provider. */
@Test(dataProvider = "testDNs")
- /** Additional tests with testDNs data provider */
public void testToIrreversibleReadableString2(String one, String two, String three) {
DN dn1 = DN.valueOf(one);
DN dn2 = DN.valueOf(two);
diff --git a/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java b/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java
index 188a37c..d0b8aef 100644
--- a/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java
+++ b/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java
@@ -54,7 +54,7 @@
private int bytesRead;
public void checkLimit(final int readSize) throws IOException {
- if ((readLimit > 0) && (bytesRead + readSize > readLimit)) {
+ if (0 < readLimit && readLimit < bytesRead + readSize) {
final LocalizableMessage message = ERR_ASN1_TRUNCATED_LENGTH_BYTE.get();
throw DecodeException.fatalError(message);
}
@@ -178,14 +178,11 @@
* If an error occurs while trying to decode an ASN1 element.
*/
public boolean elementAvailable() throws IOException {
- return !((state == ASN1.ELEMENT_READ_STATE_NEED_TYPE)
- && !needTypeState(true))
- && !((state == ASN1.ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE)
- && !needFirstLengthByteState(true))
- && !((state == ASN1.ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES)
- && !needAdditionalLengthBytesState(true))
+ return (state != ASN1.ELEMENT_READ_STATE_NEED_TYPE || needTypeState(true))
+ && (state != ASN1.ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE || needFirstLengthByteState(true))
+ && (state != ASN1.ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES
+ || needAdditionalLengthBytesState(true))
&& peekLength <= readLimiter.remaining();
-
}
/**
@@ -198,7 +195,7 @@
* If an error occurs while trying to decode an ASN1 element.
*/
public boolean hasNextElement() throws IOException {
- return (state != ASN1.ELEMENT_READ_STATE_NEED_TYPE) || needTypeState(true);
+ return state != ASN1.ELEMENT_READ_STATE_NEED_TYPE || needTypeState(true);
}
/** {@inheritDoc} */
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java
index 0271b28..ff0364d 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java
@@ -193,10 +193,9 @@
private void startPurgeIfMaxNumberAddReached() {
AtomicBoolean purgeLatch = new AtomicBoolean();
if (!isPurgeBranchRunning.get()
- && 0 < maxNbAddIterations && maxNbAddIterations < totalAdds.get()) {
- if (purgeLatch.compareAndSet(false, true)) {
- newPurgerThread().start();
- }
+ && 0 < maxNbAddIterations && maxNbAddIterations < totalAdds.get()
+ && purgeLatch.compareAndSet(false, true)) {
+ newPurgerThread().start();
}
}
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
index 36677e7..17b60b3 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
@@ -226,7 +226,7 @@
}
}
- //To allow tests
+ /** To allow tests. */
static ResponseTimeBuckets getResponseTimeBuckets() {
return new ResponseTimeBuckets();
}
--
Gitblit v1.10.0