From 68f9a86c43271c3b02daeb6923d417bfaa83358b Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 29 Jan 2014 14:38:28 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPException.java | 2
opendj3-server-dev/src/build-tools/org/opends/build/tools/GenerateMessageFile.java | 2
opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java | 36 +++++++-----------
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java | 4 +-
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java | 4 +-
opendj3-server-dev/src/server/org/opends/server/extensions/EntryCacheCommon.java | 10 +---
opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java | 4 +-
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java | 2
opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java | 4 +-
9 files changed, 28 insertions(+), 40 deletions(-)
diff --git a/opendj3-server-dev/src/build-tools/org/opends/build/tools/GenerateMessageFile.java b/opendj3-server-dev/src/build-tools/org/opends/build/tools/GenerateMessageFile.java
index 03fc43a..79cb547 100644
--- a/opendj3-server-dev/src/build-tools/org/opends/build/tools/GenerateMessageFile.java
+++ b/opendj3-server-dev/src/build-tools/org/opends/build/tools/GenerateMessageFile.java
@@ -240,7 +240,7 @@
c = Integer.class;
} else if (
"s".equals(sa5)) {
- c = CharSequence.class;
+ c = Object.class;
} else if (
"c".equals(sa5)) {
c = Character.class;
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
index 8f4ac89..7fb82cd 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
@@ -744,7 +744,7 @@
public static LocalizableMessage getThrowableMsg(LocalizableMessage message, Throwable t)
{
LocalizableMessageBuilder mb = new LocalizableMessageBuilder(message);
- LocalizableMessageDescriptor.Arg1<CharSequence> tag;
+ LocalizableMessageDescriptor.Arg1<Object> tag;
if (isOutOfMemory(t))
{
tag = INFO_EXCEPTION_OUT_OF_MEMORY_DETAILS;
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java b/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java
index 6c99f7b..6db9ff7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java
@@ -96,25 +96,22 @@
}
catch (Exception e)
{
- logger.trace(e.getMessage(), e);
+ logger.traceException(e);
- if (logger.isTraceEnabled())
- {
- logger.trace("Could not parse password policy subentry "
- + "DN %s for user %s", v.getValue(),
- userDNString, e);
- }
+ logger.trace(
+ "Could not parse password policy subentry DN %s for user %s", v
+ .getValue(), userDNString, e);
if (useDefaultOnError)
{
logger.error(ERR_PWPSTATE_CANNOT_DECODE_SUBENTRY_VALUE_AS_DN,
- v.getValue().toString(), userDNString, e.getMessage());
+ v.getValue(), userDNString, e.getMessage());
return DirectoryServer.getDefaultPasswordPolicy();
}
else
{
LocalizableMessage message = ERR_PWPSTATE_CANNOT_DECODE_SUBENTRY_VALUE_AS_DN
- .get(v.getValue().toString(), userDNString, e.getMessage());
+ .get(v.getValue(), userDNString, e.getMessage());
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, message,
e);
}
@@ -124,12 +121,10 @@
.getAuthenticationPolicy(subentryDN);
if (policy == null)
{
- logger.trace("Password policy subentry %s for user %s "
- + "is not defined in the Directory Server.",
- subentryDN, userDNString);
+ logger.trace("Password policy subentry %s for user %s is not defined in the Directory Server.",
+ subentryDN, userDNString);
- LocalizableMessage message = ERR_PWPSTATE_NO_SUCH_POLICY.get(userDNString,
- String.valueOf(subentryDN));
+ LocalizableMessage message = ERR_PWPSTATE_NO_SUCH_POLICY.get(userDNString, subentryDN);
if (useDefaultOnError)
{
logger.error(message);
@@ -167,9 +162,8 @@
{
// This shouldn't happen but if it does debug log
// this problem and fall back to default policy.
- logger.trace("Found unknown password policy subentry "
- + "DN %s for user %s", subentry.getDN(),
- userDNString);
+ logger.trace("Found unknown password policy subentry DN %s for user %s",
+ subentry.getDN(), userDNString);
break;
}
return policy;
@@ -178,17 +172,15 @@
catch (Exception e)
{
if (logger.isTraceEnabled()) {
- logger.trace("Could not parse password policy subentry "
- + "DN %s for user %s: %s", subentry.getDN(),
- userDNString, stackTraceToSingleLineString(e));
+ logger.trace("Could not parse password policy subentry DN %s for user %s: %s",
+ subentry.getDN(), userDNString, stackTraceToSingleLineString(e));
}
}
}
}
// No authentication policy found, so use the global default.
- logger.trace("Using the default password policy for user %s",
- userDNString);
+ logger.trace("Using the default password policy for user %s", userDNString);
return DirectoryServer.getDefaultPasswordPolicy();
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/EntryCacheCommon.java b/opendj3-server-dev/src/server/org/opends/server/extensions/EntryCacheCommon.java
index b7bb6e5..dd2f027 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/EntryCacheCommon.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/EntryCacheCommon.java
@@ -293,13 +293,9 @@
*
* @return the set of search filters
*/
- public static HashSet<SearchFilter> getFilters (
- SortedSet<String> filters,
- LocalizableMessageDescriptor.Arg3<CharSequence, CharSequence, CharSequence>
- decodeErrorMsg,
- ConfigErrorHandler errorHandler,
- DN configEntryDN
- )
+ public static HashSet<SearchFilter> getFilters(SortedSet<String> filters,
+ LocalizableMessageDescriptor.Arg3<Object, Object, Object> decodeErrorMsg,
+ ConfigErrorHandler errorHandler, DN configEntryDN)
{
// Returned value
HashSet<SearchFilter> searchFilters = new HashSet<SearchFilter>();
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java b/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java
index 318f41b..3055502 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java
@@ -163,7 +163,7 @@
private final Class<P> logPublisherClass;
- private final Arg3<CharSequence, CharSequence, CharSequence>
+ private final Arg3<Object, Object, Object>
invalidLoggerClassErrorMessage;
ServerContext serverContext;
@@ -178,7 +178,7 @@
*/
public AbstractLogger(
final Class<P> logPublisherClass,
- final Arg3<CharSequence, CharSequence, CharSequence>
+ final Arg3<Object, Object, Object>
invalidLoggerClassErrorMessage)
{
this.logPublisherClass = logPublisherClass;
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
index 84a32b5..03931d3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
@@ -195,7 +195,7 @@
}
private PatternDN[] decodePatterns(Set<String> patterns,
- Arg2<CharSequence, CharSequence> errorMessage, DN dn)
+ Arg2<Object, Object> errorMessage, DN dn)
throws ConfigException
{
PatternDN[] results = new PatternDN[patterns.size()];
@@ -208,7 +208,7 @@
}
catch (final DirectoryException e)
{
- throw new ConfigException(errorMessage.get(String.valueOf(dn), s));
+ throw new ConfigException(errorMessage.get(dn, s));
}
}
return results;
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
index 09e9ce0..a1d4fb9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
@@ -1128,8 +1128,8 @@
private Integer getIntegerUserAttribute(Entry userEntry,
String attributeTypeName,
- Arg1<CharSequence> nonUniqueAttributeMessage,
- Arg2<CharSequence, CharSequence> cannotProcessAttributeMessage)
+ Arg1<Object> nonUniqueAttributeMessage,
+ Arg2<Object, Object> cannotProcessAttributeMessage)
{
AttributeType attrType =
DirectoryServer.getAttributeType(attributeTypeName, true);
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
index b43e3d3..5b791b7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
@@ -828,8 +828,8 @@
* If the update operation has been rejected.
*/
static void checkIfBackendIsWritable(Backend backend, Operation op,
- DN entryDN, LocalizableMessageDescriptor.Arg1<CharSequence> serverMsg,
- LocalizableMessageDescriptor.Arg1<CharSequence> backendMsg)
+ DN entryDN, LocalizableMessageDescriptor.Arg1<Object> serverMsg,
+ LocalizableMessageDescriptor.Arg1<Object> backendMsg)
throws DirectoryException
{
if (!backend.isPrivateBackend())
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPException.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPException.java
index 1e5b5f9..d3ac954 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPException.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPException.java
@@ -58,7 +58,7 @@
{
LocalizableMessageDescriptor.Arg1 msgID = ERR_ECN_INVALID_ELEMENT_TYPE;
LDAPException ex = new LDAPException(LDAPResultCode.OTHER, msgID.get(""));
- LocalizableMessageDescriptor.Arg1<CharSequence> msgID1 =
+ LocalizableMessageDescriptor.Arg1<Object> msgID1 =
ERR_ECN_CANNOT_DECODE_VALUE;
new LDAPException(LDAPResultCode.PROTOCOL_ERROR, msgID1.get(""), ex);
assertTrue(ex.getResultCode() == LDAPResultCode.OTHER);
--
Gitblit v1.10.0