From 2977066bf9fe453d1ae6be23899e36991a8e8c1c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 24 May 2016 13:02:12 +0000
Subject: [PATCH] Formatting fixes, and small code improvements
---
opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java | 10 +++-------
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java | 4 ++--
opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateSchemaDocMojo.java | 2 +-
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/AuthorizationFilter.java | 1 +
5 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java
index f66aabf..fd4dd95 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java
@@ -11,9 +11,8 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2013-2015 ForgeRock AS.
+ * Copyright 2013-2016 ForgeRock AS.
*/
-
package org.forgerock.opendj.ldap.schema;
import java.util.ArrayList;
@@ -742,14 +741,11 @@
// RequiredAttributes is accessible only after validate
for (final AttributeType att : nf.getRequiredAttributes()) {
- assertThat(
- att.getNameOrOID().contains("cn") || att.getNameOrOID().contains("sn")
- || att.getNameOrOID().contains("uid")).isTrue();
+ assertThat(att.getNameOrOID()).isIn("cn", "sn", "uid");
}
// OptionalAttributes is accessible only after validate
for (final AttributeType att : nf.getOptionalAttributes()) {
- assertThat(att.getNameOrOID().contains("owner") || att.getNameOrOID().contains("l"))
- .isTrue();
+ assertThat(att.getNameOrOID()).isIn("owner", "l");
}
}
}
diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateSchemaDocMojo.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateSchemaDocMojo.java
index e697973..d4666e1 100644
--- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateSchemaDocMojo.java
+++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateSchemaDocMojo.java
@@ -180,6 +180,6 @@
}
private boolean isNullOrEmpty(final Locale locale) {
- return locale == null || locale.getLanguage().equals("");
+ return locale == null || locale.getLanguage().isEmpty();
}
}
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/AuthorizationFilter.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/AuthorizationFilter.java
index 614aa61..89fe42c 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/AuthorizationFilter.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/AuthorizationFilter.java
@@ -42,6 +42,7 @@
return Response.newResponsePromise(new Response(Status.FORBIDDEN));
}
};
+
private final List<ConditionalFilter> filters;
AuthorizationFilter(List<ConditionalFilter> filters) {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
index 920bf10..c856f65 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
@@ -633,7 +633,7 @@
};
}
- private static UpgradeTask convertJEBackendsToPDBBackends(final String objectClass) {
+ private static UpgradeTask convertJEBackendsToPDBBackends(final String objectClass) {
return modifyConfigEntry(INFO_UPGRADE_TASK_LOCAL_DB_TO_PDB_2_SUMMARY.get(),
"(objectclass=" + objectClass + ")",
"delete: objectclass",
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
index 2685e31..40bb565 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
@@ -1032,9 +1032,9 @@
/**
* Creates backups of the local DB backends directories by renaming adding them a ".bak" suffix.
- * e.g "userRoot" would become "userRoot.bak"
+ * e.g "userRoot" would become "userRoot.bak"
*
- * @param backendObjectClass
+ * @param backendObjectClass
* The backend object class name.
*/
static UpgradeTask renameLocalDBBackendDirectories(final String backendObjectClass)
--
Gitblit v1.10.0