From 4e860433da0ba463a4bf6e6084a9275cb832ade2 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 11 Feb 2014 13:38:04 +0000
Subject: [PATCH] Modified tools : replaced CLIException by ClientException. Replaced closeIfNotNull by Utils.closeSilently Modified unit tests due to modifications in console application.
---
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java | 8 ++++----
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java | 3 ++-
opendj-sdk/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java | 13 ++++++++++---
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java | 7 ++++---
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PromptingTrustManager.java | 4 ++--
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java | 5 +++--
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java | 5 +++--
7 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java
index b489a09..a50354c 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java
@@ -50,7 +50,7 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
-import com.forgerock.opendj.cli.CLIException;
+import com.forgerock.opendj.cli.ClientException;
import com.forgerock.opendj.cli.ConsoleApplication;
import com.forgerock.opendj.cli.FileBasedArgument;
import com.forgerock.opendj.cli.IntegerArgument;
@@ -495,7 +495,7 @@
app.readInput(LocalizableMessage.raw("Authentication ID:"), bindNameArg
.getDefaultValue() == null ? null : "dn: "
+ bindNameArg.getDefaultValue());
- } catch (CLIException e) {
+ } catch (ClientException e) {
throw new ArgumentException(LocalizableMessage
.raw("Unable to read authentication ID"), e);
}
@@ -527,7 +527,7 @@
value =
app.readInput(LocalizableMessage.raw("Bind name:"), bindNameArg
.getDefaultValue() == null ? value : bindNameArg.getDefaultValue());
- } catch (CLIException e) {
+ } catch (ClientException e) {
throw new ArgumentException(LocalizableMessage.raw("Unable to read bind name"), e);
}
}
@@ -701,7 +701,7 @@
if (value.length == 0 && app.isInteractive()) {
try {
value = app.readPassword(LocalizableMessage.raw("Bind Password:"));
- } catch (CLIException e) {
+ } catch (ClientException e) {
throw new ArgumentException(LocalizableMessage.raw("Unable to read password"), e);
}
}
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java
index 3ef2446..ab31170 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java
@@ -30,6 +30,7 @@
import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_SHORT_OUTPUT_LDIF_FILENAME;
import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
import static com.forgerock.opendj.cli.Utils.filterExitCode;
+import static org.forgerock.util.Utils.closeSilently;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -202,8 +203,8 @@
}
return ResultCode.CLIENT_SIDE_LOCAL_ERROR.intValue();
} finally {
- closeIfNotNull(sourceReader, targetReader, outputWriter);
- closeIfNotNull(sourceInputStream, targetInputStream, outputStream);
+ closeSilently(sourceReader, targetReader, outputWriter);
+ closeSilently(sourceInputStream, targetInputStream, outputStream);
}
return ResultCode.SUCCESS.intValue();
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java
index 96e9af0..e6b2076 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java
@@ -29,6 +29,7 @@
import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_SHORT_OUTPUT_LDIF_FILENAME;
import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
import static com.forgerock.opendj.cli.Utils.filterExitCode;
+import static org.forgerock.util.Utils.closeSilently;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -293,8 +294,8 @@
}
return ResultCode.CLIENT_SIDE_LOCAL_ERROR.intValue();
} finally {
- closeIfNotNull(sourceReader, changesReader, outputWriter);
- closeIfNotNull(sourceInputStream, changesInputStream, outputStream);
+ closeSilently(sourceReader, changesReader, outputWriter);
+ closeSilently(sourceInputStream, changesInputStream, outputStream);
}
return ResultCode.SUCCESS.intValue();
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java
index be888ba..6c7e07e 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java
@@ -28,6 +28,7 @@
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
import static com.forgerock.opendj.cli.Utils.filterExitCode;
+import static org.forgerock.util.Utils.closeSilently;
import java.io.BufferedReader;
import java.io.FileInputStream;
@@ -225,7 +226,7 @@
errPrintln(LocalizableMessage.raw(e.toString()));
return ResultCode.CLIENT_SIDE_FILTER_ERROR.intValue();
} finally {
- closeIfNotNull(in);
+ closeSilently(in);
}
}
@@ -305,8 +306,8 @@
}
return ResultCode.CLIENT_SIDE_LOCAL_ERROR.intValue();
} finally {
- closeIfNotNull(sourceReader, outputWriter);
- closeIfNotNull(sourceInputStream, outputStream);
+ closeSilently(sourceReader, outputWriter);
+ closeSilently(sourceInputStream, outputStream);
}
return ResultCode.SUCCESS.intValue();
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java
index afde0ba..66fccf2 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java
@@ -29,6 +29,7 @@
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
import static com.forgerock.opendj.cli.Utils.filterExitCode;
+import static org.forgerock.util.Utils.closeSilently;
import java.io.BufferedWriter;
import java.io.File;
@@ -161,7 +162,7 @@
errPrintln(INFO_MAKELDIF_PROCESSING_COMPLETE.get(numberOfEntriesWritten));
} finally {
- closeIfNotNull(generator, writer);
+ closeSilently(generator, writer);
}
return EXIT_CODE_SUCCESS;
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PromptingTrustManager.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PromptingTrustManager.java
index 5692f63..cd7a839 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PromptingTrustManager.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PromptingTrustManager.java
@@ -50,7 +50,7 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.util.Reject;
-import com.forgerock.opendj.cli.CLIException;
+import com.forgerock.opendj.cli.ClientException;
import com.forgerock.opendj.cli.ConsoleApplication;
/**
@@ -319,7 +319,7 @@
String choice;
try {
choice = app.readInput(promptMsg, defaultTrustMethod.getChoice().toString());
- } catch (final CLIException e) {
+ } catch (final ClientException e) {
// What can we do here?
throw new CertificateException(exception);
} finally {
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java b/opendj-sdk/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java
index 40d2333..eacb2cf 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java
@@ -106,11 +106,18 @@
if (expectsResults) {
assertThat(out.size()).isGreaterThan(0);
+ assertThat(out.toString("UTF-8")).contains(wrapText(expectedErrOutput, MAX_LINE_WIDTH));
} else {
- assertThat(out.size()).isEqualTo(0);
+ if (makeLDIF.isInteractive()) {
+ assertThat(out.size()).isGreaterThan(0);
+ assertThat(err.size()).isEqualTo(0);
+ assertThat(out.toString("UTF-8")).contains(wrapText(expectedErrOutput, MAX_LINE_WIDTH));
+ } else {
+ assertThat(out.size()).isEqualTo(0);
+ assertThat(err.size()).isGreaterThan(0);
+ assertThat(err.toString("UTF-8")).contains(wrapText(expectedErrOutput, MAX_LINE_WIDTH));
+ }
}
-
- assertThat(err.toString("UTF-8")).contains(wrapText(expectedErrOutput, MAX_LINE_WIDTH));
} finally {
closeSilently(outStream, errStream);
}
--
Gitblit v1.10.0