From c5f174d02277557d0f2236b67a4a8f0be9e47e49 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Mon, 18 May 2015 13:51:11 +0000
Subject: [PATCH] Code cleanup
---
opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestDnKeyFormat.java | 160 ++++++++++++++++++++++++++---------------------------
1 files changed, 78 insertions(+), 82 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestDnKeyFormat.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestDnKeyFormat.java
index 86d474b..75456ef 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestDnKeyFormat.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestDnKeyFormat.java
@@ -361,61 +361,60 @@
// Convert the test LDIF string to a byte array
byte[] originalLDIFBytes = StaticUtils.getBytes(ldifString);
- LDIFReader reader = new LDIFReader(new LDIFImportConfig(
- new ByteArrayInputStream(originalLDIFBytes)));
+ try (final LDIFReader reader = new LDIFReader(new LDIFImportConfig(new ByteArrayInputStream(originalLDIFBytes))))
+ {
+ Entry entryBefore, entryAfter;
+ while ((entryBefore = reader.readEntry(false)) != null) {
+ ByteString bytes = ID2Entry.entryToDatabase(entryBefore,
+ new DataConfig(false, false, null));
- Entry entryBefore, entryAfter;
- while ((entryBefore = reader.readEntry(false)) != null) {
- ByteString bytes = ID2Entry.entryToDatabase(entryBefore,
- new DataConfig(false, false, null));
+ entryAfter = ID2Entry.entryFromDatabase(bytes,
+ DirectoryServer.getDefaultCompressedSchema());
- entryAfter = ID2Entry.entryFromDatabase(bytes,
- DirectoryServer.getDefaultCompressedSchema());
+ // check DN and number of attributes
+ assertEquals(entryBefore.getAttributes().size(), entryAfter
+ .getAttributes().size());
- // check DN and number of attributes
- assertEquals(entryBefore.getAttributes().size(), entryAfter
- .getAttributes().size());
+ assertEquals(entryBefore.getName(), entryAfter.getName());
- assertEquals(entryBefore.getName(), entryAfter.getName());
-
- // check the object classes were not changed
- for (String ocBefore : entryBefore.getObjectClasses().values()) {
- ObjectClass objectClass = DirectoryServer.getObjectClass(ocBefore
- .toLowerCase());
- if (objectClass == null) {
- objectClass = DirectoryServer.getDefaultObjectClass(ocBefore);
- }
- String ocAfter = entryAfter.getObjectClasses().get(objectClass);
-
- assertEquals(ocBefore, ocAfter);
- }
-
- // check the user attributes were not changed
- for (AttributeType attrType : entryBefore.getUserAttributes()
- .keySet()) {
- List<Attribute> listBefore = entryBefore.getAttribute(attrType);
- List<Attribute> listAfter = entryAfter.getAttribute(attrType);
-
- assertNotNull(listAfter);
- assertEquals(listBefore.size(), listAfter.size());
-
- for (Attribute attrBefore : listBefore) {
- boolean found = false;
-
- for (Attribute attrAfter : listAfter) {
- if (attrAfter.optionsEqual(attrBefore.getOptions())) {
- // Found the corresponding attribute
-
- assertEquals(attrBefore, attrAfter);
- found = true;
- }
+ // check the object classes were not changed
+ for (String ocBefore : entryBefore.getObjectClasses().values()) {
+ ObjectClass objectClass = DirectoryServer.getObjectClass(ocBefore
+ .toLowerCase());
+ if (objectClass == null) {
+ objectClass = DirectoryServer.getDefaultObjectClass(ocBefore);
}
+ String ocAfter = entryAfter.getObjectClasses().get(objectClass);
- assertTrue(found);
+ assertEquals(ocBefore, ocAfter);
+ }
+
+ // check the user attributes were not changed
+ for (AttributeType attrType : entryBefore.getUserAttributes()
+ .keySet()) {
+ List<Attribute> listBefore = entryBefore.getAttribute(attrType);
+ List<Attribute> listAfter = entryAfter.getAttribute(attrType);
+
+ assertNotNull(listAfter);
+ assertEquals(listBefore.size(), listAfter.size());
+
+ for (Attribute attrBefore : listBefore) {
+ boolean found = false;
+
+ for (Attribute attrAfter : listAfter) {
+ if (attrAfter.optionsEqual(attrBefore.getOptions())) {
+ // Found the corresponding attribute
+
+ assertEquals(attrBefore, attrAfter);
+ found = true;
+ }
+ }
+
+ assertTrue(found);
+ }
}
}
}
- reader.close();
}
/**
@@ -431,18 +430,17 @@
// Convert the test LDIF string to a byte array
byte[] originalLDIFBytes = StaticUtils.getBytes(ldifString);
- LDIFReader reader = new LDIFReader(new LDIFImportConfig(
- new ByteArrayInputStream(originalLDIFBytes)));
+ try (final LDIFReader reader = new LDIFReader(new LDIFImportConfig(new ByteArrayInputStream(originalLDIFBytes))))
+ {
+ Entry entryBefore, entryAfterV1;
+ while ((entryBefore = reader.readEntry(false)) != null) {
+ ByteStringBuilder bsb = new ByteStringBuilder();
+ encodeV1(entryBefore, bsb);
+ entryAfterV1 = Entry.decode(bsb.asReader());
- Entry entryBefore, entryAfterV1;
- while ((entryBefore = reader.readEntry(false)) != null) {
- ByteStringBuilder bsb = new ByteStringBuilder();
- encodeV1(entryBefore, bsb);
- entryAfterV1 = Entry.decode(bsb.asReader());
-
- assertEquals(entryBefore, entryAfterV1);
+ assertEquals(entryBefore, entryAfterV1);
+ }
}
- reader.close();
}
/**
@@ -480,21 +478,20 @@
// Convert the test LDIF string to a byte array
byte[] originalLDIFBytes = StaticUtils.getBytes(ldifString);
- LDIFReader reader = new LDIFReader(new LDIFImportConfig(
- new ByteArrayInputStream(originalLDIFBytes)));
-
- Entry entryBefore, entryAfterV2;
- while ((entryBefore = reader.readEntry(false)) != null) {
- ByteStringBuilder bsb = new ByteStringBuilder();
- encodeV2(entryBefore, bsb, config);
- entryAfterV2 = Entry.decode(bsb.asReader());
- if (config.excludeDN())
- {
- entryAfterV2.setDN(entryBefore.getName());
+ try (final LDIFReader reader = new LDIFReader(new LDIFImportConfig(new ByteArrayInputStream(originalLDIFBytes))))
+ {
+ Entry entryBefore, entryAfterV2;
+ while ((entryBefore = reader.readEntry(false)) != null) {
+ ByteStringBuilder bsb = new ByteStringBuilder();
+ encodeV2(entryBefore, bsb, config);
+ entryAfterV2 = Entry.decode(bsb.asReader());
+ if (config.excludeDN())
+ {
+ entryAfterV2.setDN(entryBefore.getName());
+ }
+ assertEquals(entryBefore, entryAfterV2);
}
- assertEquals(entryBefore, entryAfterV2);
}
- reader.close();
}
/**
@@ -511,21 +508,20 @@
// Convert the test LDIF string to a byte array
byte[] originalLDIFBytes = StaticUtils.getBytes(ldifString);
- LDIFReader reader = new LDIFReader(new LDIFImportConfig(
- new ByteArrayInputStream(originalLDIFBytes)));
-
- Entry entryBefore, entryAfterV3;
- while ((entryBefore = reader.readEntry(false)) != null) {
- ByteStringBuilder bsb = new ByteStringBuilder();
- entryBefore.encode(bsb, config);
- entryAfterV3 = Entry.decode(bsb.asReader());
- if (config.excludeDN())
- {
- entryAfterV3.setDN(entryBefore.getName());
+ try (final LDIFReader reader = new LDIFReader(new LDIFImportConfig(new ByteArrayInputStream(originalLDIFBytes))))
+ {
+ Entry entryBefore, entryAfterV3;
+ while ((entryBefore = reader.readEntry(false)) != null) {
+ ByteStringBuilder bsb = new ByteStringBuilder();
+ entryBefore.encode(bsb, config);
+ entryAfterV3 = Entry.decode(bsb.asReader());
+ if (config.excludeDN())
+ {
+ entryAfterV3.setDN(entryBefore.getName());
+ }
+ assertEquals(entryBefore, entryAfterV3);
}
- assertEquals(entryBefore, entryAfterV3);
}
- reader.close();
}
@DataProvider
--
Gitblit v1.10.0