Formatting fixes, and small code improvements

Jean-Noël Rouvignac

24.33.2016 2977066bf9fe453d1ae6be23899e36991a8e8c1c

Formatting fixes, and small code improvements

 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");
            }
        }
    }

 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();
    }
}

 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) {

 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",

 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)