AutoRefactored primitive wrappers, StringBuilders and Strings.

Jean-Noel Rouvignac

16.10.2014 e346d9cf659f4b9e924d952a25b624d195cd0e12

AutoRefactored primitive wrappers, StringBuilders and Strings.

 opendj-cli/src/main/java/com/forgerock/opendj/cli/CommandBuilder.java

@@ -171,7 +171,7 @@
        final StringBuilder builder = new StringBuilder();
        builder.append(commandName);
        if (subcommandName != null) {
            builder.append(" " + subcommandName);
            builder.append(" ").append(subcommandName);
        }
        for (final Argument arg : args) {
            // This CLI is always using SSL, and the argument has been removed from
@@ -187,15 +187,15 @@
            }

            if (arg instanceof BooleanArgument) {
                builder.append(lineSeparator + argName);
                builder.append(lineSeparator).append(argName);
            } else if (arg instanceof FileBasedArgument) {
                for (String value : ((FileBasedArgument) arg).getNameToValueMap().keySet()) {
                    builder.append(lineSeparator + argName + " ");
                    builder.append(lineSeparator).append(argName).append(" ");
                    builder.append(getOutputValue(value, arg, showObfuscated));
                }
            } else {
                for (String value : arg.getValues()) {
                    builder.append(lineSeparator + argName + " ");
                    builder.append(lineSeparator).append(argName).append(" ");
                    builder.append(getOutputValue(value, arg, showObfuscated));
                }
            }

 opendj-config/src/main/java/org/forgerock/opendj/config/ACIPropertyDefinition.java

@@ -126,6 +126,6 @@
    /** {@inheritDoc} */
    @Override
    public int compare(String o1, String o2) {
        return o1.toString().compareTo(o2.toString());
        return o1.compareTo(o2);
    }
}

 opendj-config/src/main/java/org/forgerock/opendj/config/AggregationPropertyDefinition.java

@@ -960,10 +960,10 @@
        builder.append(relationDefinition.getName());

        builder.append(" targetNeedsEnablingCondition=");
        builder.append(String.valueOf(targetNeedsEnablingCondition));
        builder.append(targetNeedsEnablingCondition);

        builder.append(" targetIsEnabledCondition=");
        builder.append(String.valueOf(targetIsEnabledCondition));
        builder.append(targetIsEnabledCondition);
    }

    /** {@inheritDoc} */

 opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationFramework.java

@@ -366,8 +366,7 @@
     */
    public String printExtensionInformation() {
        final File extensionsPath =
                new File(new StringBuilder(installPath).append(File.separator).append(LIB_DIR)
                        .append(File.separator).append(EXTENSIONS_DIR).toString());
                new File(installPath + File.separator + LIB_DIR + File.separator + EXTENSIONS_DIR);

        if (!extensionsPath.exists() || !extensionsPath.isDirectory()) {
            // no extensions' directory

 opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java

@@ -153,7 +153,7 @@
        /** {@inheritDoc} */
        @Override
        public String toString() {
            return property.toString() + ": " + values;
            return property + ": " + values;
        }
    }


 opendj-core/src/main/java/com/forgerock/opendj/util/Iterables.java

@@ -280,7 +280,7 @@
                if (!firstValue) {
                    builder.append(", ");
                }
                builder.append(String.valueOf(value));
                builder.append(value);
                firstValue = false;
            }
            builder.append(']');

 opendj-core/src/main/java/com/forgerock/opendj/util/StaticUtils.java

@@ -1725,7 +1725,7 @@
                builder.append(EOL);
                for (StackTraceElement e : stackTrace) {
                    builder.append("\tat ");
                    builder.append(String.valueOf(e));
                    builder.append(e);
                    builder.append(EOL);
                }
            }

 opendj-core/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java

@@ -954,7 +954,7 @@
    public String toString() {
        final StringBuilder builder = new StringBuilder();
        builder.append("HeartBeatConnectionFactory(");
        builder.append(String.valueOf(factory));
        builder.append(factory);
        builder.append(')');
        return builder.toString();
    }

 opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java

@@ -209,7 +209,7 @@
    public String toString() {
        StringBuilder builder = new StringBuilder();
        builder.append("InternalConnection(");
        builder.append(String.valueOf(serverConnection));
        builder.append(serverConnection);
        builder.append(')');
        return builder.toString();
    }

 opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java

@@ -89,9 +89,9 @@
    public String toString() {
        final StringBuilder builder = new StringBuilder();
        builder.append("InternalConnectionFactory(");
        builder.append(String.valueOf(clientContext));
        builder.append(clientContext);
        builder.append(',');
        builder.append(String.valueOf(factory));
        builder.append(factory);
        builder.append(')');
        return builder.toString();
    }

 opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java

@@ -72,7 +72,7 @@
    public String toString() {
        final StringBuilder builder = new StringBuilder();
        builder.append("LoadBalancer(");
        builder.append(String.valueOf(algorithm));
        builder.append(algorithm);
        builder.append(')');
        return builder.toString();
    }

 opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java

@@ -137,7 +137,7 @@
        builder.append(", deleteOldRDN=");
        builder.append(isDeleteOldRDN());
        builder.append(", newSuperior=");
        builder.append(String.valueOf(getNewSuperior()));
        builder.append(getNewSuperior());
        builder.append(", controls=");
        builder.append(getControls());
        builder.append(")");

 opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java

@@ -65,7 +65,7 @@
    }

    public String getName() {
        return "Regex(" + pattern.toString() + ")";
        return "Regex(" + pattern + ")";
    }

    @Override

 opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java

@@ -568,9 +568,7 @@
        String ldifLine = record.iterator.next();
        int colonPos = ldifLine.indexOf(":");
        if (colonPos <= 0) {
            final LocalizableMessage message =
                    ERR_LDIF_NO_ATTR_NAME.get(record.lineNumber, ldifLine.toString());
            throw DecodeException.error(message);
            throw DecodeException.error(ERR_LDIF_NO_ATTR_NAME.get(record.lineNumber, ldifLine));
        }

        String attrName = toLowerCase(ldifLine.substring(0, colonPos));
@@ -583,18 +581,14 @@
            ldifLine = record.iterator.next();
            colonPos = ldifLine.indexOf(":");
            if (colonPos <= 0) {
                final LocalizableMessage message =
                        ERR_LDIF_NO_ATTR_NAME.get(record.lineNumber, ldifLine.toString());
                throw DecodeException.error(message);
                throw DecodeException.error(ERR_LDIF_NO_ATTR_NAME.get(record.lineNumber, ldifLine));
            }

            attrName = toLowerCase(ldifLine.substring(0, colonPos));
        }

        if (!attrName.equals("dn")) {
            final LocalizableMessage message =
                    ERR_LDIF_NO_DN.get(record.lineNumber, ldifLine.toString());
            throw DecodeException.error(message);
            throw DecodeException.error(ERR_LDIF_NO_DN.get(record.lineNumber, ldifLine));
        }

        /*

 opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java

@@ -273,7 +273,7 @@
        } else if (r instanceof SearchResultReference) {
            return false;
        } else {
            throw new RuntimeException("Unexpected response type: " + r.getClass().toString());
            throw new RuntimeException("Unexpected response type: " + r.getClass());
        }
    }


 opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java

@@ -2081,7 +2081,7 @@
         * template value.
         */
        void append(final Object o) {
            templateValue.append(String.valueOf(o));
            templateValue.append(o);
        }
    }
}

 opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java

@@ -140,7 +140,7 @@
            @Override
            public void addResult(int messageID, Result result) throws DecodeException, IOException {
                assertThat(result.getResultCode()).isEqualTo(resultCode);
                assertThat(result.getMatchedDN().toString()).isEqualTo(TEST_DN);
                assertThat(result.getMatchedDN()).isEqualTo(TEST_DN);
            }
        } };
    }
@@ -265,7 +265,7 @@
                CancelExtendedRequest cancelRequest =
                        CancelExtendedRequest.DECODER.decodeExtendedRequest(request,
                                new LDAPOptions().getDecodeOptions());
                assertThat(cancelRequest.getOID().toString()).isEqualTo(oidCancel);
                assertThat(cancelRequest.getOID()).isEqualTo(oidCancel);
                assertThat(cancelRequest.getRequestID()).isEqualTo(requestID);
            }
        } };

 opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java

@@ -1112,8 +1112,7 @@

            public Entry getEntry(final DN dn) throws LdapException {
                if (e == null) {
                    throw newLdapException(ResultCode.NO_SUCH_OBJECT,
                            "no such entry " + dn.toString());
                    throw newLdapException(ResultCode.NO_SUCH_OBJECT, "no such entry " + dn);
                }

                assertThat((Object) dn).isEqualTo(e.getName());

 opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java

@@ -568,8 +568,7 @@
        for (final NameForm o : schema.getNameForms()) {
            assertThat(o.getNameOrOID()).isEqualTo("myCustomNameForm");
            assertThat(o.getOID()).isEqualTo("mycustomnameform-oid");
            assertThat(o.getStructuralClass().getOID().toString()).isEqualTo(
                    "mycustomobjectclass-oid");
            assertThat(o.getStructuralClass().getOID()).isEqualTo("mycustomobjectclass-oid");
        }
    }


 opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java

@@ -834,7 +834,7 @@

        assertThat(schema.getDITContentRules()).isEmpty();
        assertThat(schema.getWarnings()).isEmpty();
        assertThat(schema.getObjectClass("myNewClass").getOID().toString()).isEqualTo(
        assertThat(schema.getObjectClass("myNewClass").getOID()).isEqualTo(
                "1.3.6.1.4.1.36733.2.1.1.15.1");
    }

@@ -928,7 +928,7 @@
                "( 1.3.6.1.4.1.1466.115.121.1.15 DESC 'Directory String' X-ORIGIN 'RFC 4512' )");
        assertThat(schema.getAttributeType("myCustomAttribute").getUsage().toString()).isEqualTo(
                "userApplications");
        assertThat(schema.getAttributeType("myCustomAttribute").getDescription().toString())
        assertThat(schema.getAttributeType("myCustomAttribute").getDescription())
                .isEqualTo("A short description");

        assertThat(schema.getObjectClassesWithName("myCustomObjClass")).isNotEmpty();
@@ -965,7 +965,7 @@
                "( 1.3.6.1.4.1.1466.115.121.1.15 DESC 'Directory String' X-ORIGIN 'RFC 4512' )");
        assertThat(schema.getAttributeType("myCustomAttribute").getUsage().toString()).isEqualTo(
                "userApplications");
        assertThat(schema.getAttributeType("myCustomAttribute").getDescription().toString())
        assertThat(schema.getAttributeType("myCustomAttribute").getDescription())
                .isEqualTo("A short description");
        assertThat(schema.getObjectClassesWithName("myCustomObjClass")).isNotEmpty();
    }
@@ -1320,7 +1320,7 @@
        assertThat(schema.getDITStructureRulesWithName("testAllowATRequiredByDCR")).isNotNull();
        assertThat(schema.getDITStructureRule(999014).getDescription()).isEqualTo(
                "A short description");
        assertThat(schema.getDITStructureRule(999014).getNameOrRuleID().toString()).isEqualTo(
        assertThat(schema.getDITStructureRule(999014).getNameOrRuleID()).isEqualTo(
                "testDITStructureRuleConstraintsSup");
    }

@@ -1346,7 +1346,7 @@

        assertThat(schema.getWarnings()).isEmpty();
        assertThat(schema.getDITContentRule("inetOPerson")).isNotNull();
        assertThat(schema.getDITContentRule("inetOPerson").getNameOrOID().toString()).isEqualTo(
        assertThat(schema.getDITContentRule("inetOPerson").getNameOrOID()).isEqualTo(
                "inetOPerson");
        assertThat(schema.getDITContentRule("inetOPerson").getDescription()).isEqualTo(
                "inetOrgPerson is defined in RFC2798");
@@ -1416,8 +1416,8 @@
                schema.getDITContentRule("testDontAllowAttributeProhibitedByDCR").getDescription())
                .isEqualTo("Ensure attributes prohibited");
        assertThat(
                schema.getDITContentRule("testDontAllowAttributeProhibitedByDCR").getNameOrOID()
                        .toString()).isEqualTo("testDontAllowAttributeProhibitedByDCR");
                schema.getDITContentRule("testDontAllowAttributeProhibitedByDCR").getNameOrOID())
                .isEqualTo("testDontAllowAttributeProhibitedByDCR");
    }

    /**
@@ -1578,7 +1578,7 @@
        for (NameForm o : schema.getNameForms()) {
            assertThat(o.getNameOrOID()).isEqualTo("testViolatesSingleValuedNameForm");
            assertThat(o.getOID()).isEqualTo("testviolatessinglevaluednameform-oid");
            assertThat(o.getStructuralClass().getOID().toString()).isEqualTo(
            assertThat(o.getStructuralClass().getOID()).isEqualTo(
                    "testviolatessinglevaluednameformoc-oid");
        }
    }

 opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java

@@ -103,7 +103,7 @@

        // values from 50 through 99 inclusive shall have 1900 added to it
        for (int yy = 50; yy <= 99; yy++) {
            String utcString = String.format("%02d0819120000Z", new Integer(yy));
            String utcString = String.format("%02d0819120000Z", yy);
            Date decodedDate = UTCTimeSyntaxImpl.decodeUTCTimeValue(utcString);
            cal.clear();
            cal.setTime(decodedDate);
@@ -125,7 +125,7 @@

        // values from 00 through 49 inclusive shall have 2000 added to it
        for (int yy = 0; yy <= 49; yy++) {
            String utcString = String.format("%02d0819120000Z", new Integer(yy));
            String utcString = String.format("%02d0819120000Z", yy);
            Date decodedDate = UTCTimeSyntaxImpl.decodeUTCTimeValue(utcString);
            cal.clear();
            cal.setTime(decodedDate);
@@ -151,7 +151,7 @@
            cal.set(1900 + yy, 7, 19, 12, 0, 0); // months are 0..11
            Date date = cal.getTime();
            String createdString = UTCTimeSyntaxImpl.createUTCTimeValue(date);
            String expectedString = String.format("%02d0819120000Z", new Integer(yy));
            String expectedString = String.format("%02d0819120000Z", yy);
            assertEquals(expectedString, createdString);
        }
    }
@@ -173,7 +173,7 @@
            cal.set(2000 + yy, 7, 19, 12, 0, 0); // months are 0..11
            Date date = cal.getTime();
            String createdString = UTCTimeSyntaxImpl.createUTCTimeValue(date);
            String expectedString = String.format("%02d0819120000Z", new Integer(yy));
            String expectedString = String.format("%02d0819120000Z", yy);
            assertEquals(expectedString, createdString);
        }
    }

 opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java

@@ -259,7 +259,7 @@
        writer.close();

        // objectclass is 'person' in the example, result must be > 0
        assertThat(actual.get(0)).isEqualTo("dn: " + getStandardEntry().getName().toString());
        assertThat(actual.get(0)).isEqualTo("dn: " + getStandardEntry().getName());
        assertThat(actual.size()).isGreaterThan(getStandardEntry().getAttributeCount());
    }

@@ -317,7 +317,7 @@
        writer.writeEntry(getStandardEntry());
        writer.close();

        assertThat(actual.get(0)).isEqualTo("dn: " + getStandardEntry().getName().toString());
        assertThat(actual.get(0)).isEqualTo("dn: " + getStandardEntry().getName());
        assertThat(actual.get(1)).contains("cn: ");
        assertThat(actual.get(2)).contains("sn: ");
    }
@@ -339,7 +339,7 @@
        writer.close();

        // 1st line is containing DN
        assertThat(actual.get(0)).isEqualTo("dn: " + getStandardEntry().getName().toString());
        assertThat(actual.get(0)).isEqualTo("dn: " + getStandardEntry().getName());
        // empty second
        assertThat(actual.get(1)).isEmpty();
        // verifying no more than 2 lines written
@@ -365,7 +365,7 @@
        writer.writeEntry(getStandardEntry());
        writer.close();

        assertThat(actual.get(0)).isEqualTo("dn: " + getStandardEntry().getName().toString());
        assertThat(actual.get(0)).isEqualTo("dn: " + getStandardEntry().getName());
        assertThat(actual.get(1)).contains("cn: ");
        assertThat(actual.get(2)).contains("sn: ");
        // 3 lines of result + 1 empty line
@@ -395,7 +395,7 @@
                opAttributes++;
            }
        }
        assertThat(actual.get(0)).isEqualTo("dn: " + getStandardEntry().getName().toString());
        assertThat(actual.get(0)).isEqualTo("dn: " + getStandardEntry().getName());
        assertThat(actual.size()).isGreaterThan(getStandardEntry().getAttributeCount());

        assertThat(opAttributes).isEqualTo(2);
@@ -425,7 +425,7 @@
            assertThat(line).doesNotContain("entryDN");
        }

        assertThat(actual.get(0)).isEqualTo("dn: " + getStandardEntry().getName().toString());
        assertThat(actual.get(0)).isEqualTo("dn: " + getStandardEntry().getName());
        assertThat(actual.size()).isGreaterThan(getStandardEntry().getAttributeCount());
    }

@@ -447,7 +447,7 @@
        writer.flush();
        writer.close();

        assertThat(actual.get(0)).isEqualTo("dn: " + getStandardEntry().getName().toString());
        assertThat(actual.get(0)).isEqualTo("dn: " + getStandardEntry().getName());
        assertThat(actual.size()).isGreaterThan(getStandardEntry().getAttributeCount());
    }


 opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Controls.java

@@ -201,8 +201,7 @@
                    ).asBoolean();
                    if (isDeleted != null && isDeleted) {
                        // Handle entry deletion
                        writer.writeComment("Deleted entry: "
                                + entry.getName().toString());
                        writer.writeComment("Deleted entry: " + entry.getName());
                        writer.writeEntry(entry);
                        writer.flush();
                    }
@@ -215,14 +214,12 @@
                    if (whenCreated != null && whenChanged != null) {
                        if (whenCreated.equals(whenChanged)) {
                            // Handle entry addition
                            writer.writeComment("Added entry: "
                                    + entry.getName().toString());
                            writer.writeComment("Added entry: " + entry.getName());
                            writer.writeEntry(entry);
                            writer.flush();
                        } else {
                            // Handle entry modification
                            writer.writeComment("Modified entry: "
                                    + entry.getName().toString());
                            writer.writeComment("Modified entry: " + entry.getName());
                            writer.writeEntry(entry);
                            writer.flush();
                        }
@@ -235,8 +232,7 @@
            System.err.println(e.getMessage());
            System.exit(e.getResult().getResultCode().intValue());
        } catch (final SearchResultReferenceIOException e) {
            System.err.println("Got search reference(s): " + e.getReference()
                    .getURIs().toString());
            System.err.println("Got search reference(s): " + e.getReference().getURIs());
        } catch (final IOException e) {
            System.err.println(e.getMessage());
            System.exit(ResultCode.CLIENT_SIDE_LOCAL_ERROR.intValue());
@@ -358,8 +354,7 @@
                System.err.println(e.getMessage());
                System.exit(e.getResult().getResultCode().intValue());
            } catch (final SearchResultReferenceIOException e) {
                System.err.println("Got search reference(s): " + e.getReference()
                        .getURIs().toString());
                System.err.println("Got search reference(s): " + e.getReference().getURIs());
            } catch (final IOException e) {
                System.err.println(e.getMessage());
                System.exit(ResultCode.CLIENT_SIDE_LOCAL_ERROR.intValue());
@@ -395,7 +390,7 @@
                while (reader.hasNext()) {
                    if (reader.isReference()) {
                        final SearchResultReference ref = reader.readReference();
                        System.out.println("Reference: " + ref.getURIs().toString());
                        System.out.println("Reference: " + ref.getURIs());
                    }
                }

@@ -408,8 +403,7 @@
                System.err.println(e.getMessage());
                System.exit(e.getResult().getResultCode().intValue());
            } catch (final SearchResultReferenceIOException e) {
                System.err.println("Got search reference(s): " + e.getReference()
                        .getURIs().toString());
                System.err.println("Got search reference(s): " + e.getReference().getURIs());
            } catch (final IOException e) {
                System.err.println(e.getMessage());
                System.exit(ResultCode.CLIENT_SIDE_LOCAL_ERROR.intValue());
@@ -561,7 +555,7 @@
                                new DecodeOptions());
                if (!(control == null) && !(control.getWarningType() == null)) {
                    System.out.println("Password policy warning "
                            + control.getWarningType().toString() + ", value "
                            + control.getWarningType() + ", value "
                            + control.getWarningValue() + " for " + dn);
                }
            } catch (final LdapException e) {
@@ -572,7 +566,7 @@
                                    new DecodeOptions());
                    if (!(control == null)) {
                        System.out.println("Password policy error "
                                + control.getErrorType().toString() + " for " + dn);
                                + control.getErrorType() + " for " + dn);
                    }
                } catch (final DecodeException de) {
                    System.err.println(de.getMessage());
@@ -653,7 +647,7 @@
                while (reader.hasNext()) {
                    if (!reader.isReference()) {
                        final SearchResultEntry entry = reader.readEntry();
                        System.out.println("Entry changed: " + entry.getName().toString());
                        System.out.println("Entry changed: " + entry.getName());

                        final EntryChangeNotificationResponseControl control =
                                entry.getControl(
@@ -661,10 +655,9 @@
                                        new DecodeOptions());

                        final PersistentSearchChangeType type = control.getChangeType();
                        System.out.println("Change type: " + type.toString());
                        System.out.println("Change type: " + type);
                        if (type.equals(PersistentSearchChangeType.MODIFY_DN)) {
                            System.out.println("Previous DN: "
                                    + control.getPreviousName().toString());
                            System.out.println("Previous DN: " + control.getPreviousName());
                        }
                        System.out.println("Change number: " + control.getChangeNumber());
                        System.out.println(); // Add a blank line.
@@ -677,8 +670,7 @@
                System.err.println(e.getMessage());
                System.exit(e.getResult().getResultCode().intValue());
            } catch (final SearchResultReferenceIOException e) {
                System.err.println("Got search reference(s): " + e.getReference()
                        .getURIs().toString());
                System.err.println("Got search reference(s): " + e.getReference().getURIs());
            }
        } else {
            System.err.println("PersistentSearchRequestControl not supported.");
@@ -873,7 +865,7 @@

        @Override
        public boolean handleReference(SearchResultReference reference) {
            System.out.println("Got a reference: " + reference.toString());
            System.out.println("Got a reference: " + reference);
            return false;
        }
    }
@@ -960,8 +952,7 @@
                System.err.println(e.getMessage());
                System.exit(e.getResult().getResultCode().intValue());
            } catch (final SearchResultReferenceIOException e) {
                System.err.println("Got search reference(s): " + e.getReference()
                        .getURIs().toString());
                System.err.println("Got search reference(s): " + e.getReference().getURIs());
            } catch (final IOException e) {
                System.err.println(e.getMessage());
                System.exit(ResultCode.CLIENT_SIDE_LOCAL_ERROR.intValue());

 opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/GetADChangeNotifications.java

@@ -114,16 +114,14 @@
            while (reader.hasNext()) {
                if (!reader.isReference()) {
                    final SearchResultEntry entry = reader.readEntry();
                    writer.writeComment("Search result entry: "
                            + entry.getName().toString());
                    writer.writeComment("Search result entry: " + entry.getName());
                    writer.writeEntry(entry);
                    writer.flush();
                } else {
                    final SearchResultReference ref = reader.readReference();

                    // Got a continuation reference.
                    writer.writeComment("Search result reference: "
                            + ref.getURIs().toString());
                    writer.writeComment("Search result reference: " + ref.getURIs());
                }
            }
        } catch (final LdapException e) {

 opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Modify.java

@@ -102,8 +102,7 @@
            while (reader.hasNext()) {
                ChangeRecord changeRecord = reader.readChangeRecord();
                writer.writeChangeRecord(changeRecord);
                System.err.println("Successfully modified entry "
                        + changeRecord.getName().toString());
                System.err.println("Successfully modified entry " + changeRecord.getName());
            }
        } catch (final LdapException e) {
            System.err.println(e.getMessage());

 opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ReadSchema.java

@@ -106,7 +106,7 @@

            System.out.println("WARNINGS");
            for (LocalizableMessage m : schema.getWarnings()) {
                System.out.println("  " + m.toString());
                System.out.println("  " + m);
            }
            System.out.println();
        } catch (final LdapException e) {

 opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Search.java

@@ -113,15 +113,13 @@
            while (reader.hasNext()) {
                if (!reader.isReference()) {
                    final SearchResultEntry entry = reader.readEntry();
                    writer.writeComment("Search result entry: "
                            + entry.getName().toString());
                    writer.writeComment("Search result entry: " + entry.getName());
                    writer.writeEntry(entry);
                } else {
                    final SearchResultReference ref = reader.readReference();

                    // Got a continuation reference.
                    writer.writeComment("Search result reference: "
                            + ref.getURIs().toString());
                    writer.writeComment("Search result reference: " + ref.getURIs());
                }
            }
            writer.flush();

 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplate.java

@@ -68,7 +68,7 @@
        @Override
        public String formatAsAuthzId(final AuthzIdTemplate t, final Object[] templateVariables,
                final Schema schema) throws ResourceException {
            return "dn:" + DN.format(t.dnFormatString, schema, templateVariables).toString();
            return "dn:" + DN.format(t.dnFormatString, schema, templateVariables);
        }

    };

 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JSONConstantAttributeMapper.java

@@ -48,7 +48,7 @@

    @Override
    public String toString() {
        return "constant(" + value.toString() + ")";
        return "constant(" + value + ")";
    }

    @Override

 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ObjectAttributeMapper.java

@@ -84,7 +84,7 @@

    @Override
    public String toString() {
        return "object(" + mappings.values().toString() + ")";
        return "object(" + mappings.values() + ")";
    }

    @Override

 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java

@@ -122,7 +122,7 @@

    @Override
    public String toString() {
        return "reference(" + ldapAttributeName.toString() + ")";
        return "reference(" + ldapAttributeName + ")";
    }

    @Override

 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java

@@ -107,7 +107,7 @@

    @Override
    public String toString() {
        return "simple(" + ldapAttributeName.toString() + ")";
        return "simple(" + ldapAttributeName + ")";
    }

    @Override

 opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupLog.java

@@ -63,8 +63,7 @@
        final String space = " ";

        if (logFile == null) {
            logFile = new File(new StringBuilder(SetupCli.getInstallationPath()).append(File.separator).append(LOGNAME)
                    .toString());
            logFile = new File(SetupCli.getInstallationPath() + File.separator + LOGNAME);
        }
        try {
            fileHandler = new FileHandler(logFile.getCanonicalPath(), true);

 opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/ConvertersTestCase.java

@@ -295,7 +295,7 @@
        org.forgerock.opendj.ldap.Attribute attribute = new LinkedAttribute("test", "value1");

        org.opends.server.types.Attribute srvAttribute = toAttribute(attribute);
        assertThat(srvAttribute.getAttributeType().getNameOrOID().toString()).isEqualTo("test");
        assertThat(srvAttribute.getAttributeType().getNameOrOID()).isEqualTo("test");
        assertThat(srvAttribute.size()).isEqualTo(1);
        assertThat(srvAttribute.iterator().next().toString()).isEqualTo("value1");

@@ -303,7 +303,7 @@
                new LinkedAttribute("Another", ByteString.valueOf("myValue"));

        org.opends.server.types.Attribute srvAttribute2 = toAttribute(attribute2);
        assertThat(srvAttribute2.getAttributeType().getNameOrOID().toString()).isEqualTo("Another");
        assertThat(srvAttribute2.getAttributeType().getNameOrOID()).isEqualTo("Another");
        assertThat(srvAttribute2.size()).isEqualTo(1);
        assertThat(srvAttribute2.iterator().next().toString()).isEqualTo("myValue");
    }
@@ -317,7 +317,7 @@
                new LinkedAttribute("testMultiValuedAttribute", "value1", "value2");

        org.opends.server.types.RawAttribute srvAttribute = to(attribute);
        assertThat(srvAttribute.getAttributeType().toString())
        assertThat(srvAttribute.getAttributeType())
                .isEqualTo("testMultiValuedAttribute");
        assertThat(srvAttribute.getValues().size()).isEqualTo(2);
        assertThat(srvAttribute.getValues().get(0).toString()).isEqualTo("value1");
@@ -328,7 +328,7 @@
                        "value4");

        org.opends.server.types.RawAttribute srvAttribute2 = to(attribute2);
        assertThat(srvAttribute2.getAttributeType().toString()).isEqualTo(
        assertThat(srvAttribute2.getAttributeType()).isEqualTo(
                "AnotherMultiValuedAttribute");
        assertThat(srvAttribute2.getValues().size()).isEqualTo(4);
        assertThat(srvAttribute2.getValues().get(0).toString()).isEqualTo("value1");
@@ -343,7 +343,7 @@
                new LinkedAttribute("testMultiValuedAttribute", "value1", "value2");

        org.opends.server.types.Attribute srvAttribute = toAttribute(attribute);
        assertThat(srvAttribute.getAttributeType().getNameOrOID().toString())
        assertThat(srvAttribute.getAttributeType().getNameOrOID())
            .isEqualTo("testMultiValuedAttribute");
        assertThat(srvAttribute.size()).isEqualTo(2);
        Iterator<AttributeValue> iter = srvAttribute.iterator();
@@ -355,7 +355,7 @@
                        "value4");

        org.opends.server.types.Attribute srvAttribute2 = toAttribute(attribute2);
        assertThat(srvAttribute2.getAttributeType().getNameOrOID().toString())
        assertThat(srvAttribute2.getAttributeType().getNameOrOID())
            .isEqualTo("AnotherMultiValuedAttribute");
        assertThat(srvAttribute2.size()).isEqualTo(4);
        iter = srvAttribute2.iterator();

 opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java

@@ -282,7 +282,7 @@
        org.forgerock.opendj.ldap.Attribute attribute = new LinkedAttribute("test", "value1");

        org.opends.server.types.Attribute srvAttribute = toAttribute(attribute);
        assertThat(srvAttribute.getAttributeType().getNameOrOID().toString()).isEqualTo("test");
        assertThat(srvAttribute.getAttributeType().getNameOrOID()).isEqualTo("test");
        assertThat(srvAttribute.size()).isEqualTo(1);
        assertThat(srvAttribute.iterator().next().toString()).isEqualTo("value1");

@@ -290,7 +290,7 @@
                new LinkedAttribute("Another", ByteString.valueOf("myValue"));

        org.opends.server.types.Attribute srvAttribute2 = toAttribute(attribute2);
        assertThat(srvAttribute2.getAttributeType().getNameOrOID().toString()).isEqualTo("Another");
        assertThat(srvAttribute2.getAttributeType().getNameOrOID()).isEqualTo("Another");
        assertThat(srvAttribute2.size()).isEqualTo(1);
        assertThat(srvAttribute2.iterator().next().toString()).isEqualTo("myValue");
    }
@@ -304,7 +304,7 @@
                new LinkedAttribute("testMultiValuedAttribute", "value1", "value2");

        org.opends.server.types.RawAttribute srvAttribute = to(attribute);
        assertThat(srvAttribute.getAttributeType().toString())
        assertThat(srvAttribute.getAttributeType())
                .isEqualTo("testMultiValuedAttribute");
        assertThat(srvAttribute.getValues().size()).isEqualTo(2);
        assertThat(srvAttribute.getValues().get(0).toString()).isEqualTo("value1");
@@ -315,7 +315,7 @@
                        "value4");

        org.opends.server.types.RawAttribute srvAttribute2 = to(attribute2);
        assertThat(srvAttribute2.getAttributeType().toString()).isEqualTo(
        assertThat(srvAttribute2.getAttributeType()).isEqualTo(
                "AnotherMultiValuedAttribute");
        assertThat(srvAttribute2.getValues().size()).isEqualTo(4);
        assertThat(srvAttribute2.getValues().get(0).toString()).isEqualTo("value1");
@@ -330,7 +330,7 @@
                new LinkedAttribute("testMultiValuedAttribute", "value1", "value2");

        org.opends.server.types.Attribute srvAttribute = toAttribute(attribute);
        assertThat(srvAttribute.getAttributeType().getNameOrOID().toString())
        assertThat(srvAttribute.getAttributeType().getNameOrOID())
            .isEqualTo("testMultiValuedAttribute");
        assertThat(srvAttribute.size()).isEqualTo(2);
        Iterator<ByteString> iter = srvAttribute.iterator();
@@ -342,7 +342,7 @@
                        "value4");

        org.opends.server.types.Attribute srvAttribute2 = toAttribute(attribute2);
        assertThat(srvAttribute2.getAttributeType().getNameOrOID().toString())
        assertThat(srvAttribute2.getAttributeType().getNameOrOID())
            .isEqualTo("AnotherMultiValuedAttribute");
        assertThat(srvAttribute2.size()).isEqualTo(4);
        iter = srvAttribute2.iterator();