From 41ce7aae1112d4092eefef57f7c26a449b079bee Mon Sep 17 00:00:00 2001
From: davidely <davidely@localhost>
Date: Wed, 15 Aug 2007 22:48:11 +0000
Subject: [PATCH] Removed ambiguity between two Messages.raw methods to make certain IDEs happy by reodering the parameters of one of the methods
---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java | 8 ++--
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java | 16 ++++----
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/MessageTest.java | 4 +-
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java | 4 +-
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java | 3 +
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java | 24 ++++++------
opendj-sdk/opends/src/messages/src/org/opends/messages/Message.java | 8 ++--
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java | 12 +++---
8 files changed, 40 insertions(+), 39 deletions(-)
diff --git a/opendj-sdk/opends/src/messages/src/org/opends/messages/Message.java b/opendj-sdk/opends/src/messages/src/org/opends/messages/Message.java
index b5dde16..91e0693 100644
--- a/opendj-sdk/opends/src/messages/src/org/opends/messages/Message.java
+++ b/opendj-sdk/opends/src/messages/src/org/opends/messages/Message.java
@@ -83,16 +83,16 @@
* are creating is locale sensitive. If so you should instead create
* a formal message.
*
- * @param formatString of the message or the message itself if not
- * arguments are necessary
* @param category of this message
* @param severity of this message
+ * @param formatString of the message or the message itself if not
+ * arguments are necessary
* @param args any arguments for the format string
* @return a message object that will render the same in all locales;
* null if <code>formatString</code> is null
*/
- static public Message raw(CharSequence formatString, Category category,
- Severity severity, Object... args) {
+ static public Message raw(Category category, Severity severity,
+ CharSequence formatString, Object... args) {
Message message = null;
if (formatString != null) {
MessageDescriptor.Raw md =
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/MessageTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/MessageTest.java
index 97a2270..1e0c928 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/MessageTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/MessageTest.java
@@ -71,7 +71,7 @@
@Test(dataProvider = "rawData1")
public void testRaw1(String fmt, Category c, Severity s,
String result, Object... args) {
- Message message = Message.raw(fmt, c, s, args);
+ Message message = Message.raw(c, s, fmt, args);
assert (message.toString().equals(result));
assert (message.toString(Locale.CHINESE).equals(result));
}
@@ -91,7 +91,7 @@
@Test(dataProvider = "rawData1")
public void testGetDescriptor(String fmt, Category c, Severity s,
String result, Object... args) {
- Message message = Message.raw(fmt, c, s, args);
+ Message message = Message.raw(c, s, fmt, args);
MessageDescriptor desc = message.getDescriptor();
assert(desc.getCategory().equals(c));
assert(desc.getSeverity().equals(s));
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
index 1df2ca2..0236f64 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
@@ -145,7 +145,8 @@
private void log(String s)
{
- logError(Message.raw("InitOnLineTests/" + s, Category.SYNC, Severity.INFORMATION));
+ logError(Message.raw(Category.SYNC, Severity.INFORMATION,
+ "InitOnLineTests/" + s));
if (debugEnabled())
{
TRACER.debugInfo(s);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
index 26f515f..ab60995 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
@@ -94,8 +94,8 @@
public void saturateQueueAndRestart() throws Exception
{
logError(Message.raw(
- "Starting Replication ProtocolWindowTest : saturateAndRestart",
- Category.SYNC, Severity.INFORMATION));
+ Category.SYNC, Severity.INFORMATION,
+ "Starting Replication ProtocolWindowTest : saturateAndRestart"));
final DN baseDn = DN.decode("ou=People,dc=example,dc=com");
@@ -339,8 +339,8 @@
public void protocolVersion() throws Exception
{
logError(Message.raw(
- "Starting Replication ProtocolWindowTest : protocolVersion",
- Category.SYNC, Severity.INFORMATION));
+ Category.SYNC, Severity.INFORMATION,
+ "Starting Replication ProtocolWindowTest : protocolVersion"));
final DN baseDn = DN.decode("ou=People,dc=example,dc=com");
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
index ffa44a1..0a5dbef 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
@@ -250,8 +250,8 @@
*/
protected void cleanConfigEntries()
{
- logError(Message.raw("ReplicationTestCase/Cleaning config entries",
- Category.SYNC, Severity.NOTICE));
+ logError(Message.raw(Category.SYNC, Severity.NOTICE,
+ "ReplicationTestCase/Cleaning config entries"));
DeleteOperationBasis op;
// Delete entries
@@ -260,8 +260,8 @@
while (true)
{
DN dn = configEntryList.removeLast();
- logError(Message.raw("cleaning config entry " + dn,
- Category.SYNC, Severity.NOTICE));
+ logError(Message.raw(Category.SYNC, Severity.NOTICE,
+ "cleaning config entry " + dn));
op = new DeleteOperationBasis(connection, InternalClientConnection
.nextOperationID(), InternalClientConnection.nextMessageID(), null,
@@ -279,8 +279,8 @@
*/
protected void cleanRealEntries()
{
- logError(Message.raw("ReplicationTestCase/Cleaning entries",
- Category.SYNC, Severity.NOTICE));
+ logError(Message.raw(Category.SYNC, Severity.NOTICE,
+ "ReplicationTestCase/Cleaning entries"));
DeleteOperationBasis op;
// Delete entries
@@ -289,8 +289,8 @@
while (true)
{
DN dn = entryList.removeLast();
- logError(Message.raw("cleaning entry " + dn,
- Category.SYNC, Severity.NOTICE));
+ logError(Message.raw(Category.SYNC, Severity.NOTICE,
+ "cleaning entry " + dn));
op = new DeleteOperationBasis(connection, InternalClientConnection
.nextOperationID(), InternalClientConnection.nextMessageID(), null,
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
index 279f555..246430d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
@@ -131,8 +131,8 @@
@Test()
public void pushSchemaChange() throws Exception
{
- logError(Message.raw("Starting replication test : pushSchemaChange ",
- Category.SYNC, Severity.NOTICE));
+ logError(Message.raw(Category.SYNC, Severity.NOTICE,
+ "Starting replication test : pushSchemaChange "));
final DN baseDn = DN.decode("cn=schema");
@@ -216,8 +216,8 @@
@Test(dependsOnMethods = { "pushSchemaChange" })
public void replaySchemaChange() throws Exception
{
- logError(Message.raw("Starting replication test : pushSchemaChange ",
- Category.SYNC, Severity.NOTICE));
+ logError(Message.raw(Category.SYNC, Severity.NOTICE,
+ "Starting replication test : pushSchemaChange "));
final DN baseDn = DN.decode("cn=schema");
@@ -249,8 +249,8 @@
@Test(enabled=true, dependsOnMethods = { "replaySchemaChange" })
public void pushSchemaFilesChange() throws Exception
{
- logError(Message.raw("Starting replication test : pushSchemaFilesChange ",
- Category.SYNC, Severity.NOTICE));
+ logError(Message.raw(Category.SYNC, Severity.NOTICE,
+ "Starting replication test : pushSchemaFilesChange "));
final DN baseDn = DN.decode("cn=schema");
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
index 2bcd932..66238c4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
@@ -85,8 +85,8 @@
@Test(enabled=true, groups="slow")
public void fromServertoBroker() throws Exception
{
- logError(Message.raw("Starting replication StressTest : fromServertoBroker",
- Category.SYNC, Severity.NOTICE));
+ logError(Message.raw(Category.SYNC, Severity.NOTICE,
+ "Starting replication StressTest : fromServertoBroker"));
final DN baseDn = DN.decode("ou=People,dc=example,dc=com");
final int TOTAL_MESSAGES = 1000;
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
index ecf8e88..4d1d947 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
@@ -295,8 +295,8 @@
@Test(enabled=false)
public void toggleReceiveStatus() throws Exception
{
- logError(Message.raw("Starting synchronization test : toggleReceiveStatus",
- Category.SYNC, Severity.INFORMATION));
+ logError(Message.raw(Category.SYNC, Severity.INFORMATION,
+ "Starting synchronization test : toggleReceiveStatus"));
final DN baseDn = DN.decode("ou=People,dc=example,dc=com");
@@ -375,8 +375,8 @@
@Test(groups = "slow")
public void lostHeartbeatFailover() throws Exception
{
- logError(Message.raw("Starting replication test : lostHeartbeatFailover",
- Category.SYNC, Severity.INFORMATION));
+ logError(Message.raw(Category.SYNC, Severity.INFORMATION,
+ "Starting replication test : lostHeartbeatFailover"));
cleanRealEntries();
@@ -604,8 +604,8 @@
@Test(enabled=true, groups="slow")
public void namingConflicts() throws Exception
{
- logError(Message.raw("Starting replication test : namingConflicts",
- Category.SYNC, Severity.INFORMATION));
+ logError(Message.raw(Category.SYNC, Severity.INFORMATION,
+ "Starting replication test : namingConflicts"));
final DN baseDn = DN.decode("ou=People,dc=example,dc=com");
String resolvedMonitorAttr = "resolved-naming-conflicts";
@@ -1138,8 +1138,8 @@
public void updateOperations(boolean assured) throws Exception
{
logError(Message.raw(
- "Starting replication test : updateOperations " + assured,
- Category.SYNC, Severity.INFORMATION));
+ Category.SYNC, Severity.INFORMATION,
+ "Starting replication test : updateOperations " + assured));
final DN baseDn = DN.decode("ou=People,dc=example,dc=com");
@@ -1401,8 +1401,8 @@
@Test(enabled=true)
public void deleteNoSuchObject() throws Exception
{
- logError(Message.raw("Starting replication test : deleteNoSuchObject",
- Category.SYNC, Severity.INFORMATION));
+ logError(Message.raw(Category.SYNC, Severity.INFORMATION,
+ "Starting replication test : deleteNoSuchObject"));
DN dn = DN.decode("cn=No Such Object,ou=People,dc=example,dc=com");
DeleteOperationBasis op =
@@ -1422,8 +1422,8 @@
@Test(enabled=false)
public void infiniteReplayLoop() throws Exception
{
- logError(Message.raw("Starting replication test : infiniteReplayLoop",
- Category.SYNC, Severity.INFORMATION));
+ logError(Message.raw(Category.SYNC, Severity.INFORMATION,
+ "Starting replication test : infiniteReplayLoop"));
final DN baseDn = DN.decode("ou=People,dc=example,dc=com");
--
Gitblit v1.10.0