From 670e6a579de3cbd66600e4a3a40223fa81e7ee23 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 04 Oct 2013 07:55:49 +0000
Subject: [PATCH] Follow up on r9644: OPENDJ-176 - Use SLF4J for logging in the SDK
---
opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Matcher.java | 2 +-
opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java | 12 +++++-------
opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/StaticUtils.java | 9 ++++-----
opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPWriter.java | 24 +++++++++++++++++++++++-
4 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPWriter.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPWriter.java
index e9e1210..9c5fddc 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPWriter.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPWriter.java
@@ -168,6 +168,7 @@
}
}
+ @Override
public void abandonRequest(final ASN1Writer writer, final int messageID,
final AbandonRequest request) throws IOException {
IO_LOG.trace("ENCODE LDAP ABANDON REQUEST(messageID={}, request={})", messageID, request);
@@ -176,6 +177,7 @@
encodeMessageFooter(writer, request);
}
+ @Override
public void addRequest(final ASN1Writer writer, final int messageID, final AddRequest request)
throws IOException {
IO_LOG.trace("ENCODE LDAP ADD REQUEST(messageID={}, request={})", messageID, request);
@@ -194,6 +196,7 @@
encodeMessageFooter(writer, request);
}
+ @Override
public void addResult(final ASN1Writer writer, final int messageID, final Result result)
throws IOException {
IO_LOG.trace("ENCODE LDAP ADD RESULT(messageID={}, result={})", messageID, result);
@@ -203,6 +206,7 @@
encodeMessageFooter(writer, result);
}
+ @Override
public void bindRequest(final ASN1Writer writer, final int messageID, final int version,
final GenericBindRequest request) throws IOException {
IO_LOG.trace("ENCODE LDAP BIND REQUEST(messageID={}, auth=0x{}, request={})",
@@ -218,6 +222,7 @@
encodeMessageFooter(writer, request);
}
+ @Override
public void bindResult(final ASN1Writer writer, final int messageID, final BindResult result)
throws IOException {
IO_LOG.trace("ENCODE LDAP BIND RESULT(messageID={}, result={})", messageID, result);
@@ -233,6 +238,7 @@
encodeMessageFooter(writer, result);
}
+ @Override
public void compareRequest(final ASN1Writer writer, final int messageID,
final CompareRequest request) throws IOException {
IO_LOG.trace("ENCODE LDAP COMPARE REQUEST(messageID={}, request={})", messageID, request);
@@ -249,6 +255,7 @@
encodeMessageFooter(writer, request);
}
+ @Override
public void compareResult(final ASN1Writer writer, final int messageID,
final CompareResult result) throws IOException {
IO_LOG.trace("ENCODE LDAP COMPARE RESULT(messageID={}, result={})", messageID, result);
@@ -258,6 +265,7 @@
encodeMessageFooter(writer, result);
}
+ @Override
public void deleteRequest(final ASN1Writer writer, final int messageID,
final DeleteRequest request) throws IOException {
IO_LOG.trace("ENCODE LDAP DELETE REQUEST(messageID={}, request={})", messageID, request);
@@ -266,6 +274,7 @@
encodeMessageFooter(writer, request);
}
+ @Override
public void deleteResult(final ASN1Writer writer, final int messageID, final Result result)
throws IOException {
IO_LOG.trace("ENCODE LDAP DELETE RESULT(messageID={}, result={})", messageID, result);
@@ -275,6 +284,7 @@
encodeMessageFooter(writer, result);
}
+ @Override
public <R extends ExtendedResult> void extendedRequest(final ASN1Writer writer,
final int messageID, final ExtendedRequest<R> request) throws IOException {
IO_LOG.trace("ENCODE LDAP EXTENDED REQUEST(messageID={}, request={})", messageID, request);
@@ -291,6 +301,7 @@
encodeMessageFooter(writer, request);
}
+ @Override
public void extendedResult(final ASN1Writer writer, final int messageID,
final ExtendedResult result) throws IOException {
IO_LOG.trace("ENCODE LDAP EXTENDED RESULT(messageID={}, result={})", messageID, result);
@@ -312,6 +323,7 @@
encodeMessageFooter(writer, result);
}
+ @Override
public void intermediateResponse(final ASN1Writer writer, final int messageID,
final IntermediateResponse response) throws IOException {
IO_LOG.trace("ENCODE LDAP INTERMEDIATE RESPONSE(messageID={}, response={})", messageID, response);
@@ -333,6 +345,7 @@
encodeMessageFooter(writer, response);
}
+ @Override
public void modifyDNRequest(final ASN1Writer writer, final int messageID,
final ModifyDNRequest request) throws IOException {
IO_LOG.trace("ENCODE LDAP MODIFY DN REQUEST(messageID={}, request={})", messageID, request);
@@ -351,6 +364,7 @@
encodeMessageFooter(writer, request);
}
+ @Override
public void modifyDNResult(final ASN1Writer writer, final int messageID, final Result result)
throws IOException {
IO_LOG.trace("ENCODE LDAP MODIFY DN RESULT(messageID={}, result={})", messageID, result);
@@ -360,6 +374,7 @@
encodeMessageFooter(writer, result);
}
+ @Override
public void modifyRequest(final ASN1Writer writer, final int messageID,
final ModifyRequest request) throws IOException {
IO_LOG.trace("ENCODE LDAP MODIFY REQUEST(messageID={}, request={})", messageID, request);
@@ -377,6 +392,7 @@
encodeMessageFooter(writer, request);
}
+ @Override
public void modifyResult(final ASN1Writer writer, final int messageID, final Result result)
throws IOException {
IO_LOG.trace("ENCODE LDAP MODIFY RESULT(messageID={}, result={})", messageID, result);
@@ -386,6 +402,7 @@
encodeMessageFooter(writer, result);
}
+ @Override
public void searchRequest(final ASN1Writer writer, final int messageID,
final SearchRequest request) throws IOException {
IO_LOG.trace("ENCODE LDAP SEARCH REQUEST(messageID={}, request={})", messageID, request);
@@ -409,6 +426,7 @@
encodeMessageFooter(writer, request);
}
+ @Override
public void searchResult(final ASN1Writer writer, final int messageID, final Result result)
throws IOException {
IO_LOG.trace("ENCODE LDAP SEARCH RESULT(messageID={}, result={})", messageID, result);
@@ -418,6 +436,7 @@
encodeMessageFooter(writer, result);
}
+ @Override
public void searchResultEntry(final ASN1Writer writer, final int messageID,
final SearchResultEntry entry) throws IOException {
IO_LOG.trace("ENCODE LDAP SEARCH RESULT ENTRY(messageID={}, entry={})", messageID, entry);
@@ -426,6 +445,7 @@
encodeMessageFooter(writer, entry);
}
+ @Override
public void searchResultReference(final ASN1Writer writer, final int messageID,
final SearchResultReference reference) throws IOException {
IO_LOG.trace("ENCODE LDAP SEARCH RESULT REFERENCE(messageID={}, reference={})", messageID, reference);
@@ -438,6 +458,7 @@
encodeMessageFooter(writer, reference);
}
+ @Override
public void unbindRequest(final ASN1Writer writer, final int messageID,
final UnbindRequest request) throws IOException {
IO_LOG.trace("ENCODE LDAP UNBIND REQUEST(messageID={}, request={})", messageID, request);
@@ -446,10 +467,11 @@
encodeMessageFooter(writer, request);
}
+ @Override
public void unrecognizedMessage(final ASN1Writer writer, final int messageID,
final byte messageTag, final ByteString messageBytes) throws IOException {
IO_LOG.trace("ENCODE LDAP UNKNOWN MESSAGE(messageID={}, messageTag={}, messageBytes={})",
- messageID, StaticUtils.byteToHex(messageTag), messageBytes.toString());
+ messageID, StaticUtils.byteToHex(messageTag), messageBytes);
encodeMessageHeader(writer, messageID);
writer.writeOctetString(messageTag, messageBytes);
writer.writeEndSequence();
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/StaticUtils.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/StaticUtils.java
index b492b49..f14ad93 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/StaticUtils.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/StaticUtils.java
@@ -1783,8 +1783,7 @@
builder.append(separator);
builder.append(i.next());
}
- String s = builder.toString();
- return s;
+ return builder.toString();
}
}
@@ -2226,10 +2225,10 @@
}
}
if (DEBUG_TO_STDERR) {
- System.err.println(builder.toString());
- } else if (DEFAULT_LOG.isErrorEnabled()) {
+ System.err.println(builder);
+ } else {
// TODO: I18N
- DEFAULT_LOG.error(builder.toString());
+ DEFAULT_LOG.error("{}", builder);
}
}
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java
index 6d2776b..6ef2481 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java
@@ -987,10 +987,10 @@
*/
private static final class Sync extends AbstractQueuedSynchronizer {
private static final int LOCKED_EXCLUSIVELY = -1;
- // Keep compiler quiet.
+ /** Keep compiler quiet. */
private static final long serialVersionUID = -3590428415442668336L;
- /* Lock states. Positive values indicate that the shared lock is taken. */
+ /** Lock states. Positive values indicate that the shared lock is taken. */
private static final int UNLOCKED = 0; // initial state
@Override
@@ -1191,11 +1191,9 @@
if (isClosed.compareAndSet(false, true)) {
synchronized (validConnections) {
if (!validConnections.isEmpty()) {
- if (DEFAULT_LOG.isDebugEnabled()) {
- DEFAULT_LOG.debug(
- "HeartbeatConnectionFactory '{}' is closing while {} active connections remain",
- toString(), validConnections.size());
- }
+ DEFAULT_LOG.debug(
+ "HeartbeatConnectionFactory '{}' is closing while {} active connections remain",
+ this, validConnections.size());
}
}
releaseScheduler();
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Matcher.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Matcher.java
index 12edf88..c4b8730 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Matcher.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Matcher.java
@@ -534,7 +534,7 @@
} catch (final DecodeException de) {
// TODO: I18N
DEFAULT_LOG.warn("The attribute value {} is invalid for matching rule {}. Possible schema error?",
- v.toString(), rule.getNameOrOID(), de);
+ v, rule.getNameOrOID(), de);
return ConditionResult.UNDEFINED;
}
}
--
Gitblit v1.10.0