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/protocols/ldap/BindResponseProtocolOp.java | 26 ++++++--------------------
1 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
index dc2910c..3462cb5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
@@ -27,21 +27,18 @@
package org.opends.server.protocols.ldap;
import org.forgerock.i18n.LocalizableMessage;
-
-import java.util.Iterator;
import java.util.List;
import java.io.IOException;
import org.forgerock.opendj.io.*;
import org.opends.server.types.DN;
import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.util.Utils;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
import static org.opends.server.util.ServerConstants.*;
-
-
/**
* This class defines the structures and methods for an LDAP delete response
* protocol op, which is used to provide information about the result of
@@ -263,7 +260,7 @@
stream.writeOctetString(errorMessage.toString());
}
- if ((referralURLs != null) && (! referralURLs.isEmpty()))
+ if (referralURLs != null && !referralURLs.isEmpty())
{
stream.writeStartSequence(TYPE_REFERRAL_SEQUENCE);
for (String s : referralURLs)
@@ -295,31 +292,20 @@
buffer.append("BindResponse(resultCode=");
buffer.append(resultCode);
- if ((errorMessage != null) && (errorMessage.length() > 0))
+ if (errorMessage != null && errorMessage.length() > 0)
{
buffer.append(", errorMessage=");
buffer.append(errorMessage);
}
-
if (matchedDN != null)
{
buffer.append(", matchedDN=");
buffer.append(matchedDN);
}
-
- if ((referralURLs != null) && (! referralURLs.isEmpty()))
+ if (referralURLs != null && !referralURLs.isEmpty())
{
buffer.append(", referralURLs={");
-
- Iterator<String> iterator = referralURLs.iterator();
- buffer.append(iterator.next());
-
- while (iterator.hasNext())
- {
- buffer.append(", ");
- buffer.append(iterator.next());
- }
-
+ buffer.append(Utils.joinAsString(", ", referralURLs));
buffer.append("}");
}
@@ -375,7 +361,7 @@
buffer.append(EOL);
}
- if ((referralURLs != null) && (! referralURLs.isEmpty()))
+ if (referralURLs != null && !referralURLs.isEmpty())
{
buffer.append(indentBuf);
buffer.append(" Referral URLs: ");
--
Gitblit v1.10.0