From be568465d0063d55f558fb20056044280a3bc5cc Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 20 Sep 2013 23:14:42 +0000
Subject: [PATCH] Fix various FindBugs warnings.
---
opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Matcher.java | 17 +++++++++--------
opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java | 6 ++++--
opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java | 2 +-
opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java | 2 +-
opendj-sdk/opendj3/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/AdaptersTestCase.java | 8 +++++---
opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java | 5 ++---
opendj-sdk/opendj3/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/ConvertersTestCase.java | 2 +-
7 files changed, 23 insertions(+), 19 deletions(-)
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 871e370..a3a270c 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2013 ForgeRock AS.
*/
package org.forgerock.opendj.ldap;
@@ -350,6 +350,14 @@
} else {
try {
ruleUse = schema.getMatchingRuleUse(rule);
+ if (!ruleUse.hasAttribute(ad.getAttributeType())) {
+ if (DEBUG_LOG.isLoggable(Level.WARNING)) {
+ DEBUG_LOG.warning("The matching rule " + matchingRule
+ + " is not valid for attribute type "
+ + attributeDescription);
+ }
+ return UNDEFINED;
+ }
} catch (final UnknownSchemaElementException e) {
if (DEBUG_LOG.isLoggable(Level.WARNING)) {
DEBUG_LOG.warning("No matching rule use is defined for "
@@ -357,13 +365,6 @@
return UNDEFINED;
}
}
- if (!ruleUse.hasAttribute(ad.getAttributeType())) {
- if (DEBUG_LOG.isLoggable(Level.WARNING)) {
- DEBUG_LOG.warning("The matching rule " + matchingRule
- + " is not valid for attribute type " + attributeDescription);
- }
- return UNDEFINED;
- }
}
} else {
try {
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java
index e106d60..0cb184f 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java
@@ -122,7 +122,7 @@
builder.append(getReferralURIs());
if (password != null) {
builder.append(", genPassword=");
- builder.append(password);
+ builder.append(ByteString.valueOf(password));
}
builder.append(", controls=");
builder.append(getControls());
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java
index f2469a8..c053ec6 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java
@@ -353,10 +353,9 @@
* If the value contains a null, newline, or return character, then it
* needs to be base64 encoded.
*/
- byte b;
for (int i = 0; i < bytes.length(); i++) {
- b = bytes.byteAt(i);
- if (b > 127 || b < 0) {
+ final byte b = bytes.byteAt(i);
+ if (b < 0) {
return true;
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java b/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
index 6a883b1..9dd1ee7 100644
--- a/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
+++ b/opendj-sdk/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
package com.forgerock.opendj.ldap.tools;
@@ -32,6 +32,7 @@
import static com.forgerock.opendj.ldap.tools.Utils.filterExitCode;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.Connection;
import org.forgerock.opendj.ldap.ConnectionFactory;
import org.forgerock.opendj.ldap.DecodeException;
@@ -300,7 +301,8 @@
if (result.getGeneratedPassword() != null) {
message =
- INFO_LDAPPWMOD_GENERATED_PASSWORD.get(result.getGeneratedPassword().toString());
+ INFO_LDAPPWMOD_GENERATED_PASSWORD.get(ByteString.valueOf(
+ result.getGeneratedPassword()).toString());
println(message);
}
diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java b/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java
index edb811a..40af8f0 100644
--- a/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java
+++ b/opendj-sdk/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java
@@ -708,7 +708,7 @@
private AttributeNameStrategy(final AttributeType dnAttribute,
final AttributeDescription idAttribute, final boolean isServerProvided) {
this.dnAttribute = AttributeDescription.create(dnAttribute);
- if (dnAttribute.equals(idAttribute)) {
+ if (this.dnAttribute.equals(idAttribute)) {
throw new IllegalArgumentException("DN and ID attributes must be different");
}
this.idAttribute = ensureNotNull(idAttribute);
diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/AdaptersTestCase.java b/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/AdaptersTestCase.java
index 07c70ad..e191124 100644
--- a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/AdaptersTestCase.java
+++ b/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/AdaptersTestCase.java
@@ -94,7 +94,7 @@
* @return Anonymous connection factories.
*/
@DataProvider
- private Object[][] anonymousConnectionFactories() {
+ public Object[][] anonymousConnectionFactories() {
return new Object[][] {
{ new LDAPConnectionFactory("localhost", Integer.valueOf(CONFIG_PROPERTIES
.getProperty("listen-port"))) }, { Adapters.newAnonymousConnectionFactory() } };
@@ -106,7 +106,7 @@
* @return Root connection factories.
*/
@DataProvider
- private Object[][] rootConnectionFactories() {
+ public Object[][] rootConnectionFactories() {
return new Object[][] {
{ Connections.newAuthenticatedConnectionFactory(new LDAPConnectionFactory("localhost",
Integer.valueOf(CONFIG_PROPERTIES.getProperty("listen-port"))), Requests
@@ -224,7 +224,9 @@
assertThat(connection.isValid()).isTrue();
assertThat(connection.isClosed()).isFalse();
} finally {
- connection.close();
+ if (connection != null) {
+ connection.close();
+ }
}
}
diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/ConvertersTestCase.java b/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/ConvertersTestCase.java
index 4e88d16..346021c 100644
--- a/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/ConvertersTestCase.java
+++ b/opendj-sdk/opendj3/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/ConvertersTestCase.java
@@ -540,7 +540,7 @@
}
@DataProvider(name = "operation result type")
- private Object[][] getOperationResultTypes() {
+ public Object[][] getOperationResultTypes() {
return new Object[][] {
{ BindOperation.class, BindResult.class },
{ CompareOperation.class, CompareResult.class },
--
Gitblit v1.10.0