add LDIF write attribute order by attribute:value (source control)

vharseko

19.34.2018 62fb24e77cfcb4520fbca17e425fbee9c5c9975a

add LDIF write attribute order by attribute:value (source control)

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

@@ -282,10 +282,10 @@

            final String attributeDescription = attribute.getAttributeDescriptionAsString();
            if (attribute.isEmpty()) {
                attr.put(attributeDescription+attr.size(), new AbstractMap.SimpleEntry<String,ByteSequence>(attributeDescription,ByteString.empty()) );
                attr.put(attributeDescription, new AbstractMap.SimpleEntry<String,ByteSequence>(attributeDescription,ByteString.empty()) );
            } else {
                for (final ByteString value : attribute) {
                    attr.put(attributeDescription+attr.size(), new AbstractMap.SimpleEntry<String,ByteSequence>(attributeDescription,value));
                    attr.put(attributeDescription+value, new AbstractMap.SimpleEntry<String,ByteSequence>(attributeDescription,value));
                }
            }
        }

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

@@ -754,14 +754,14 @@
        final String[] expected =
                new String[] { "dn: cn=John Doe,ou=people,dc=example,dc=com", 
                        "cn: John Doe", 
                        "description: five six",
                        "description: one two", 
                        "description: three four",
                        "description: five six", 
                        "givenName: John",
                        "localized;lang-fr:: w6dlZGlsbGE=", 
                        "objectClass: top",
                        "objectClass: person", 
                        "objectClass: inetOrgPerson", 
                        "objectClass: person", 
                        "objectClass: top",
                        "sn: Doe",
                        "typeOnly: ", 
                        

 opendj-ldap-toolkit/src/test/resources/expected_output.ldif

@@ -6,6 +6,6 @@
coretokenobject: {"redirectURI":["http://fake.com"],"acr":[],"clientID":["clientOIDC"],"lineFoldingTest":["This line should have been correctly folded"],"tokenName":["refresh_token"],"authModules":["LDAP"],"realm":["/myrealm"],"id":["fakeid"],"userName":["johndoe"],"tokenType":["Bearer"]}
coretokenstring07: Bearer
coretokenstring08: /myrealm
objectClass: top
objectClass: frCoreToken
objectClass: top


 opendj-ldap-toolkit/src/test/resources/expected_output_80_column.ldif

@@ -9,6 +9,6 @@
 id"],"userName":["johndoe"],"tokenType":["Bearer"]}
coretokenstring07: Bearer
coretokenstring08: /myrealm
objectClass: top
objectClass: frCoreToken
objectClass: top


 opendj-ldap-toolkit/src/test/resources/ldifdiff/ldifDiffAndModifyTestCase.ldif

@@ -1,5 +1,5 @@
dn: dc=example,dc=com
dc: example
objectClass: top
objectClass: domain
objectClass: top