From ffdc9e43e8135f1fba633d863a6c487ea09b1fb2 Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Thu, 26 May 2016 11:15:14 +0000
Subject: [PATCH] Code Cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java | 1 +
opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java | 19 +++++++------------
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
index 678bd20..d21b6d6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
@@ -285,6 +285,7 @@
}
catch (CryptoManagerException cme)
{
+ logger.traceException(cme);
throw DecodeException.error(cme.getMessageObject());
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
index 04c921f..958f159 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
@@ -136,8 +136,7 @@
@see org.opends.server.crypto.CryptoManagerSync
@see org.opends.server.crypto.GetSymmetricKeyExtendedOperation
*/
-public class CryptoManagerImpl
- implements ConfigurationChangeListener<CryptoManagerCfg>, CryptoManager
+public class CryptoManagerImpl implements ConfigurationChangeListener<CryptoManagerCfg>, CryptoManager
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -1259,13 +1258,9 @@
return uuidBytes;
}
- /**
- * Returns the {@code String} representation of this
- * {@code KeyEntryID}.
- * @return The {@code String} representation of this
- * {@code KeyEntryID}.
- */
- public String getStringValue() {
+
+ @Override
+ public String toString() {
return fValue.toString();
}
@@ -1550,7 +1545,7 @@
{
// Construct the key entry DN.
ByteString distinguishedValue =
- ByteString.valueOfUtf8(keyEntry.getKeyID().getStringValue());
+ ByteString.valueOfUtf8(keyEntry.getKeyID().toString());
DN entryDN = secretKeysDN.child(
new RDN(attrKeyID, distinguishedValue));
@@ -2020,7 +2015,7 @@
{
// Construct the key entry DN.
ByteString distinguishedValue =
- ByteString.valueOfUtf8(keyEntry.getKeyID().getStringValue());
+ ByteString.valueOfUtf8(keyEntry.getKeyID().toString());
DN entryDN = secretKeysDN.child(
new RDN(attrKeyID, distinguishedValue));
@@ -2400,7 +2395,7 @@
keyLengthBits);
}
- return keyEntry.getKeyID().getStringValue();
+ return keyEntry.getKeyID().toString();
}
@Override
--
Gitblit v1.10.0