From 31216400c324b43c15b8a9eea6d89604247ebb14 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 03 Feb 2014 12:10:05 +0000
Subject: [PATCH] Removed now useless calls to String.valueOf() on arguments of ArgN.get(...).
---
opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java | 71 +++++++++--------------------------
1 files changed, 19 insertions(+), 52 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
index 53f784b..56914a4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
@@ -49,6 +49,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
+import org.opends.server.util.StaticUtils;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ExtensionMessages.*;
@@ -132,7 +133,7 @@
if (pinStr == null) {
LocalizableMessage message = ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(
- String.valueOf(propertyName), String.valueOf(configEntryDN));
+ propertyName, configEntryDN);
throw new InitializationException(message);
}
@@ -144,7 +145,7 @@
if (pinStr == null) {
LocalizableMessage message = ERR_PKCS11_KEYMANAGER_PIN_ENVAR_NOT_SET.get(
- String.valueOf(enVarName), String.valueOf(configEntryDN));
+ enVarName, configEntryDN);
throw new InitializationException(message);
}
@@ -154,8 +155,7 @@
File pinFile = getFileForPath(fileName);
if (!pinFile.exists()) {
- LocalizableMessage message = ERR_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE.get(
- String.valueOf(fileName), String.valueOf(configEntryDN));
+ LocalizableMessage message = ERR_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE.get(fileName, configEntryDN);
throw new InitializationException(message);
}
@@ -169,14 +169,12 @@
logger.traceException(ioe);
LocalizableMessage message = ERR_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ.
- get(String.valueOf(fileName), String.valueOf(configEntryDN),
- getExceptionMessage(ioe));
+ get(fileName, configEntryDN, getExceptionMessage(ioe));
throw new InitializationException(message, ioe);
}
if (pinStr == null) {
- LocalizableMessage message = ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY.get(
- String.valueOf(fileName), String.valueOf(configEntryDN));
+ LocalizableMessage message = ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY.get(fileName, configEntryDN);
throw new InitializationException(message);
}
@@ -294,9 +292,7 @@
if (pinStr == null)
{
- unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(
- String.valueOf(propertyName),
- String.valueOf(cfgEntryDN)));
+ unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(propertyName, cfgEntryDN));
configAcceptable = false;
}
}
@@ -307,9 +303,7 @@
if (pinStr == null)
{
- unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_ENVAR_NOT_SET.get(
- String.valueOf(enVarName),
- String.valueOf(cfgEntryDN)));
+ unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_ENVAR_NOT_SET.get(enVarName, configEntryDN));
configAcceptable = false;
}
}
@@ -320,9 +314,7 @@
if (!pinFile.exists())
{
- unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE.get(
- String.valueOf(fileName),
- String.valueOf(cfgEntryDN)));
+ unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE.get(fileName, configEntryDN));
configAcceptable = false;
}
else
@@ -337,25 +329,17 @@
{
unacceptableReasons.add(
ERR_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ.get(
- String.valueOf(fileName),
- String.valueOf(cfgEntryDN),
- getExceptionMessage(ioe)));
+ fileName, cfgEntryDN, getExceptionMessage(ioe)));
configAcceptable = false;
}
finally
{
- try
- {
- br.close();
- } catch (Exception e) {}
+ StaticUtils.close(br);
}
if (pinStr == null)
{
-
- unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY.get(
- String.valueOf(fileName),
- String.valueOf(cfgEntryDN)));
+ unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY.get(fileName, configEntryDN));
configAcceptable = false;
}
}
@@ -367,9 +351,7 @@
{
// We should have a pin from the configuration, but no.
unacceptableReasons.add(
- ERR_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR.get(
- String.valueOf(cfgEntryDN),
- "null"));
+ ERR_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR.get(cfgEntryDN, null));
configAcceptable = false;
}
}
@@ -412,9 +394,7 @@
{
resultCode = DirectoryServer.getServerErrorResultCode();
- messages.add(ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(
- String.valueOf(propertyName),
- String.valueOf(configEntryDN)));
+ messages.add(ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(propertyName, configEntryDN));
}
else
{
@@ -430,9 +410,7 @@
{
resultCode = DirectoryServer.getServerErrorResultCode();
- messages.add(ERR_PKCS11_KEYMANAGER_PIN_ENVAR_NOT_SET.get(
- String.valueOf(enVarName),
- String.valueOf(configEntryDN)));
+ messages.add(ERR_PKCS11_KEYMANAGER_PIN_ENVAR_NOT_SET.get(enVarName, configEntryDN));
}
else
{
@@ -448,9 +426,7 @@
{
resultCode = DirectoryServer.getServerErrorResultCode();
- messages.add(ERR_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE.get(
- String.valueOf(fileName),
- String.valueOf(configEntryDN)));
+ messages.add(ERR_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE.get(fileName, configEntryDN));
}
else
{
@@ -463,27 +439,18 @@
catch (IOException ioe)
{
resultCode = DirectoryServer.getServerErrorResultCode();
-
messages.add(ERR_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ.get(
- String.valueOf(fileName),
- String.valueOf(configEntryDN),
- getExceptionMessage(ioe)));
+ fileName, configEntryDN, getExceptionMessage(ioe)));
}
finally
{
- try
- {
- br.close();
- } catch (Exception e) {}
+ StaticUtils.close(br);
}
if (pinStr == null)
{
resultCode = DirectoryServer.getServerErrorResultCode();
-
- messages.add(ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY.get(
- String.valueOf(fileName),
- String.valueOf(configEntryDN)));
+ messages.add(ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY.get(fileName, configEntryDN));
}
else
{
--
Gitblit v1.10.0