From 62fb24e77cfcb4520fbca17e425fbee9c5c9975a Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@openam.org.ru>
Date: Wed, 19 Dec 2018 08:34:35 +0000
Subject: [PATCH] add LDIF write attribute order by attribute:value (source control)
---
opendj-ldap-toolkit/src/test/resources/ldifdiff/ldifDiffAndModifyTestCase.ldif | 2 +-
opendj-ldap-toolkit/src/test/resources/expected_output_80_column.ldif | 2 +-
opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java | 4 ++--
opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java | 6 +++---
opendj-ldap-toolkit/src/test/resources/expected_output.ldif | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java
index 1a15741..fa00f1f 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java
+++ b/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));
}
}
}
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java
index f5cd9de..894bb46 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java
+++ b/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: ",
diff --git a/opendj-ldap-toolkit/src/test/resources/expected_output.ldif b/opendj-ldap-toolkit/src/test/resources/expected_output.ldif
index 30dd660..378c557 100644
--- a/opendj-ldap-toolkit/src/test/resources/expected_output.ldif
+++ b/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
diff --git a/opendj-ldap-toolkit/src/test/resources/expected_output_80_column.ldif b/opendj-ldap-toolkit/src/test/resources/expected_output_80_column.ldif
index 93a7749..7568330 100644
--- a/opendj-ldap-toolkit/src/test/resources/expected_output_80_column.ldif
+++ b/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
diff --git a/opendj-ldap-toolkit/src/test/resources/ldifdiff/ldifDiffAndModifyTestCase.ldif b/opendj-ldap-toolkit/src/test/resources/ldifdiff/ldifDiffAndModifyTestCase.ldif
index 597ba43..be7f129 100644
--- a/opendj-ldap-toolkit/src/test/resources/ldifdiff/ldifDiffAndModifyTestCase.ldif
+++ b/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
--
Gitblit v1.10.0