From dc7e0efd09b538b9ed21a414dff79fb1cf6f2d64 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Thu, 17 May 2007 22:02:02 +0000
Subject: [PATCH] Perform miscellaneous cleanup from bugs and other potential problems found by FindBugs
---
opends/src/server/org/opends/server/types/AddressMask.java | 2
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ChangeNumberTest.java | 26 +++---
opends/src/server/org/opends/server/extensions/FIFOEntryCache.java | 12 ++-
opends/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java | 1
opends/src/server/org/opends/server/types/LDIFImportConfig.java | 6 -
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/DbHandlerTest.java | 6
opends/src/server/org/opends/server/plugins/profiler/ProfileViewer.java | 7 -
opends/src/server/org/opends/server/util/CertificateManager.java | 6
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java | 60 +++++++-------
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ChangeNumberGeneratorTest.java | 12 +-
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java | 20 ++--
opends/src/server/org/opends/server/replication/plugin/PendingChanges.java | 2
opends/src/server/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java | 2
opends/src/server/org/opends/server/replication/server/ReplicationServer.java | 1
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java | 4
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentStateTest.java | 4
opends/src/server/org/opends/server/replication/common/ChangeNumber.java | 2
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java | 2
opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java | 2
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java | 22 ++--
opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java | 2
opends/src/server/org/opends/server/replication/common/ChangeNumberGenerator.java | 2
opends/src/server/org/opends/server/replication/common/ServerState.java | 10 +-
23 files changed, 105 insertions(+), 108 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java b/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java
index cc0bc9b..c8b40d5 100644
--- a/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java
+++ b/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java
@@ -111,6 +111,14 @@
+ /**
+ * The reference to the Java runtime used to determine the amount of memory
+ * currently in use.
+ */
+ private static final Runtime runtime = Runtime.getRuntime();
+
+
+
// The DN of the configuration entry for this entry cache.
private DN configEntryDN;
@@ -145,10 +153,6 @@
// The maximum number of entries that may be held in the cache.
private long maxEntries;
- // The reference to the Java runtime to use to determine the amount of memory
- // currently in use.
- private Runtime runtime;
-
static
diff --git a/opends/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java b/opends/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
index 4472529..df7f2af 100644
--- a/opends/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
+++ b/opends/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
@@ -205,6 +205,7 @@
int msgID = MSGID_SUBSCHEMASUBENTRY_VATTR_NOT_SEARCHABLE;
String message = getMessage(msgID, rule.getAttributeType().getNameOrOID());
+ searchOperation.appendErrorMessage(message);
}
}
diff --git a/opends/src/server/org/opends/server/plugins/profiler/ProfileViewer.java b/opends/src/server/org/opends/server/plugins/profiler/ProfileViewer.java
index 2fddb30..9d01fa6 100644
--- a/opends/src/server/org/opends/server/plugins/profiler/ProfileViewer.java
+++ b/opends/src/server/org/opends/server/plugins/profiler/ProfileViewer.java
@@ -484,7 +484,6 @@
}
String largestCountString = String.valueOf(subFrames[0].getTotalCount());
- int largestCountLength = largestCountString.length();
for (ProfileStackFrame subFrame : subFrames)
{
@@ -569,12 +568,6 @@
// There is a tree node selected, so we should convert it to a stack
// frame and display information about it.
ProfileStackFrame frame = (ProfileStackFrame) selectedObject;
- if (frame == null)
- {
- frameInfoPane.setText("");
- return;
- }
-
StringBuilder html = new StringBuilder();
html.append("<HTML><BODY><PRE>");
diff --git a/opends/src/server/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java b/opends/src/server/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java
index e0fb0a3..a5360f3 100644
--- a/opends/src/server/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java
+++ b/opends/src/server/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java
@@ -75,7 +75,7 @@
@Override
public String toString()
{
- return authID.toString();
+ return authID;
}
/**
diff --git a/opends/src/server/org/opends/server/replication/common/ChangeNumber.java b/opends/src/server/org/opends/server/replication/common/ChangeNumber.java
index cb73fb4..998efb2 100644
--- a/opends/src/server/org/opends/server/replication/common/ChangeNumber.java
+++ b/opends/src/server/org/opends/server/replication/common/ChangeNumber.java
@@ -130,7 +130,7 @@
@Override
public int hashCode()
{
- return this.seqnum + this.serverId + (new Long(this.timeStamp)).hashCode();
+ return this.seqnum + this.serverId + Long.valueOf(timeStamp).hashCode();
}
/**
diff --git a/opends/src/server/org/opends/server/replication/common/ChangeNumberGenerator.java b/opends/src/server/org/opends/server/replication/common/ChangeNumberGenerator.java
index a49577c..85eb36d 100644
--- a/opends/src/server/org/opends/server/replication/common/ChangeNumberGenerator.java
+++ b/opends/src/server/org/opends/server/replication/common/ChangeNumberGenerator.java
@@ -79,7 +79,7 @@
*
* @return the generated ChangeNUmber
*/
- public ChangeNumber NewChangeNumber()
+ public ChangeNumber newChangeNumber()
{
/* TODO : we probably don't need a time stamp with a 1 msec accuracy */
long curTime = TimeThread.getTime();
diff --git a/opends/src/server/org/opends/server/replication/common/ServerState.java b/opends/src/server/org/opends/server/replication/common/ServerState.java
index 38fd50d..1b5f36a 100644
--- a/opends/src/server/org/opends/server/replication/common/ServerState.java
+++ b/opends/src/server/org/opends/server/replication/common/ServerState.java
@@ -221,17 +221,19 @@
@Override
public String toString()
{
+ StringBuilder buffer = new StringBuilder();
+
synchronized (this)
{
- String str = null;
for (Short key : list.keySet())
{
ChangeNumber change = list.get(key);
- str += " " + change.toString();
+ buffer.append(" ");
+ buffer.append(change);
}
-
- return str;
}
+
+ return buffer.toString();
}
/**
diff --git a/opends/src/server/org/opends/server/replication/plugin/PendingChanges.java b/opends/src/server/org/opends/server/replication/plugin/PendingChanges.java
index 8f5f295..02f24c2 100644
--- a/opends/src/server/org/opends/server/replication/plugin/PendingChanges.java
+++ b/opends/src/server/org/opends/server/replication/plugin/PendingChanges.java
@@ -178,7 +178,7 @@
{
ChangeNumber changeNumber;
- changeNumber = changeNumberGenerator.NewChangeNumber();
+ changeNumber = changeNumberGenerator.newChangeNumber();
PendingChange change = new PendingChange(changeNumber, operation, null);
pendingChanges.put(changeNumber, change);
return changeNumber;
diff --git a/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java b/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
index 5c811fd..0d1f234 100644
--- a/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
+++ b/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
@@ -2390,7 +2390,7 @@
String.valueOf(failureReason));
logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
message, msgID);
- new DirectoryException(ResultCode.OTHER, message, msgID);
+ throw new DirectoryException(ResultCode.OTHER, message, msgID);
}
// FIXME setBackendEnabled should be part taskUtils ?
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
index 219ecc0..2f70139 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -147,6 +147,7 @@
initialize(replicationServerId, replicationPort);
configuration.addChangeListener(this);
+ configDn = configuration.dn();
}
/**
diff --git a/opends/src/server/org/opends/server/types/AddressMask.java b/opends/src/server/org/opends/server/types/AddressMask.java
index f2dcb79..3775380 100644
--- a/opends/src/server/org/opends/server/types/AddressMask.java
+++ b/opends/src/server/org/opends/server/types/AddressMask.java
@@ -415,7 +415,7 @@
*/
public String toString()
{
- return new String(ruleString);
+ return ruleString;
}
/**
diff --git a/opends/src/server/org/opends/server/types/LDIFImportConfig.java b/opends/src/server/org/opends/server/types/LDIFImportConfig.java
index d222111..9341cf2 100644
--- a/opends/src/server/org/opends/server/types/LDIFImportConfig.java
+++ b/opends/src/server/org/opends/server/types/LDIFImportConfig.java
@@ -136,7 +136,7 @@
// The set of attribute types that should be included in the import.
private Set<AttributeType> includeAttributes;
-//Indicates whether all the user attributes should be included.
+ // Indicates whether all the user attributes should be included.
private boolean includeAllUserAttrs;
//Indicates whether all the operational attributes should be
@@ -150,10 +150,6 @@
// excluded.
private boolean excludeAllOpAttrs;
- // The MakeLDIF template file that should be used to generate
- // entries (instead of having them read from a file).
- private TemplateFile templateFile;
-
/**
diff --git a/opends/src/server/org/opends/server/util/CertificateManager.java b/opends/src/server/org/opends/server/util/CertificateManager.java
index 1a725c8..2d14397 100644
--- a/opends/src/server/org/opends/server/util/CertificateManager.java
+++ b/opends/src/server/org/opends/server/util/CertificateManager.java
@@ -446,10 +446,10 @@
KEYTOOL_COMMAND,
"-genkey",
"-alias", alias,
- "-dname", subjectDN.toString(),
+ "-dname", subjectDN,
"-keyalg", "rsa",
"-keystore", keyStorePath,
- "-storetype", keyStoreType,
+ "-storetype", keyStoreType
};
runKeyTool(commandElements, keyStorePIN, keyStorePIN, true);
@@ -538,7 +538,7 @@
KEYTOOL_COMMAND,
"-genkey",
"-alias", alias,
- "-dname", subjectDN.toString(),
+ "-dname", subjectDN,
"-keyalg", "rsa",
"-keystore", keyStorePath,
"-storetype", keyStoreType
diff --git a/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java b/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
index 2f0f862..f006681 100644
--- a/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
+++ b/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
@@ -1240,7 +1240,7 @@
if (a.needsValue())
{
String valuePlaceholder = a.getValuePlaceholder();
- if (a == null)
+ if (valuePlaceholder == null)
{
value = " {value}";
}
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
index e06ac23..e9db51d 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
@@ -158,14 +158,14 @@
new LinkedList<AttributeValue>());
addDn = "dc=dependency" + sequence + "," + addDn;
AddMsg addMsg =
- new AddMsg(gen.NewChangeNumber(), addDn, stringUID(sequence+1),
+ new AddMsg(gen.newChangeNumber(), addDn, stringUID(sequence+1),
stringUID(sequence),
entry.getObjectClassAttribute(),
entry.getAttributes(), null );
broker.publish(addMsg);
ModifyMsg modifyMsg =
- new ModifyMsg(gen.NewChangeNumber(), DN.decode(addDn),
+ new ModifyMsg(gen.newChangeNumber(), DN.decode(addDn),
generatemods("description", "test"),
stringUID(sequence+1));
broker.publish(modifyMsg);
@@ -220,7 +220,7 @@
while (sequence-->1)
{
DeleteMsg delMsg = new DeleteMsg(deleteDN.toString(),
- gen.NewChangeNumber(),
+ gen.newChangeNumber(),
stringUID(sequence + 1));
broker.publish(delMsg);
deleteDN = deleteDN.getParent();
@@ -348,14 +348,14 @@
new LinkedList<AttributeValue>());
addDn = "dc=dependency" + sequence + "," + addDn;
AddMsg addMsg =
- new AddMsg(gen.NewChangeNumber(), addDn, stringUID(sequence+1),
+ new AddMsg(gen.newChangeNumber(), addDn, stringUID(sequence+1),
stringUID(sequence == 1 ? sequence : sequence +1000),
entry.getObjectClassAttribute(),
entry.getAttributes(), null );
broker.publish(addMsg);
// delete the entry
- DeleteMsg delMsg = new DeleteMsg(addDn, gen.NewChangeNumber(),
+ DeleteMsg delMsg = new DeleteMsg(addDn, gen.newChangeNumber(),
stringUID(sequence+1));
broker.publish(delMsg);
@@ -364,7 +364,7 @@
entry.addAttribute(new Attribute("entryuuid", stringUID(sequence+1001)),
new LinkedList<AttributeValue>());
addMsg =
- new AddMsg(gen.NewChangeNumber(), addDn, stringUID(sequence+1001),
+ new AddMsg(gen.newChangeNumber(), addDn, stringUID(sequence+1001),
stringUID(sequence == 1 ? sequence : sequence +1000),
entry.getObjectClassAttribute(),
entry.getAttributes(), null );
@@ -400,7 +400,7 @@
while (sequence-->1)
{
DeleteMsg delMsg = new DeleteMsg(deleteDN.toString(),
- gen.NewChangeNumber(),
+ gen.newChangeNumber(),
stringUID(sequence + 1001));
broker.publish(delMsg);
deleteDN = deleteDN.getParent();
@@ -485,7 +485,7 @@
new LinkedList<AttributeValue>());
addDn = "dc=dependency" + sequence + "," + BASEDN_STRING;
AddMsg addMsg =
- new AddMsg(gen.NewChangeNumber(), addDn, stringUID(sequence+1),
+ new AddMsg(gen.newChangeNumber(), addDn, stringUID(sequence+1),
stringUID(1),
entry.getObjectClassAttribute(),
entry.getAttributes(), null );
@@ -493,7 +493,7 @@
// rename the entry
ModifyDNMsg moddnMsg =
- new ModifyDNMsg(addDn, gen.NewChangeNumber(), stringUID(sequence+1),
+ new ModifyDNMsg(addDn, gen.newChangeNumber(), stringUID(sequence+1),
stringUID(1), true, null, "dc=new_dep" + sequence);
broker.publish(moddnMsg);
}
@@ -521,7 +521,7 @@
{
addDn = "dc=new_dep" + sequence + "," + BASEDN_STRING;
DeleteMsg delMsg = new DeleteMsg(addDn.toString(),
- gen.NewChangeNumber(),
+ gen.newChangeNumber(),
stringUID(sequence + 1001));
broker.publish(delMsg);
}
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
index ca032fb..8468f5a 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
@@ -226,7 +226,7 @@
ChangeNumberGenerator gen = new ChangeNumberGenerator((short)2, 0);
- ModifyMsg modMsg = new ModifyMsg(gen.NewChangeNumber(),
+ ModifyMsg modMsg = new ModifyMsg(gen.newChangeNumber(),
baseDn, rcvdMods, "cn=schema");
broker.publish(modMsg);
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
index 003d141..38fa771 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
@@ -254,7 +254,7 @@
// Create and publish an update message to add an entry.
- AddMsg addMsg = new AddMsg(gen.NewChangeNumber(),
+ AddMsg addMsg = new AddMsg(gen.newChangeNumber(),
personWithUUIDEntry.getDN().toString(),
user1entryUUID,
baseUUID,
@@ -275,7 +275,7 @@
setReceiveStatus(synchroServerEntry.getDN().toString(), true);
// Create and publish another update message to add an entry.
- addMsg = new AddMsg(gen.NewChangeNumber(),
+ addMsg = new AddMsg(gen.newChangeNumber(),
personWithUUIDEntry.getDN().toString(),
user1entryUUID,
baseUUID,
@@ -292,7 +292,7 @@
// Delete the entries to clean the database.
DeleteMsg delMsg =
new DeleteMsg(personWithUUIDEntry.getDN().toString(),
- gen.NewChangeNumber(), user1entryUUID);
+ gen.newChangeNumber(), user1entryUUID);
broker.publish(delMsg);
resultEntry = getEntry(personWithUUIDEntry.getDN(), 10000, false);
@@ -333,7 +333,7 @@
// Create and publish an update message to add an entry.
- AddMsg addMsg = new AddMsg(gen.NewChangeNumber(),
+ AddMsg addMsg = new AddMsg(gen.newChangeNumber(),
personWithUUIDEntry.getDN().toString(),
user1entryUUID,
baseUUID,
@@ -351,7 +351,7 @@
// Send a first modify operation message.
List<Modification> mods = generatemods("telephonenumber", "01 02 45");
- ModifyMsg modMsg = new ModifyMsg(gen.NewChangeNumber(),
+ ModifyMsg modMsg = new ModifyMsg(gen.newChangeNumber(),
personWithUUIDEntry.getDN(), mods,
user1entryUUID);
broker.publish(modMsg);
@@ -371,7 +371,7 @@
// Send a second modify operation message.
mods = generatemods("description", "Description was changed");
- modMsg = new ModifyMsg(gen.NewChangeNumber(),
+ modMsg = new ModifyMsg(gen.newChangeNumber(),
personWithUUIDEntry.getDN(), mods,
user1entryUUID);
broker.publish(modMsg);
@@ -388,7 +388,7 @@
// Delete the entries to clean the database.
DeleteMsg delMsg =
new DeleteMsg(personWithUUIDEntry.getDN().toString(),
- gen.NewChangeNumber(), user1entryUUID);
+ gen.newChangeNumber(), user1entryUUID);
broker.publish(delMsg);
resultEntry = getEntry(personWithUUIDEntry.getDN(), 10000, false);
@@ -439,7 +439,7 @@
* Finally check that the modify operation has been applied.
*/
// create the entry with a given DN
- AddMsg addMsg = new AddMsg(gen.NewChangeNumber(),
+ AddMsg addMsg = new AddMsg(gen.newChangeNumber(),
personWithUUIDEntry.getDN().toString(),
user1entryUUID,
baseUUID,
@@ -455,7 +455,7 @@
// send a modify operation with the correct unique ID but another DN
List<Modification> mods = generatemods("telephonenumber", "01 02 45");
- ModifyMsg modMsg = new ModifyMsg(gen.NewChangeNumber(),
+ ModifyMsg modMsg = new ModifyMsg(gen.newChangeNumber(),
DN.decode("cn=something,ou=People,dc=example,dc=com"), mods,
user1entryUUID);
broker.publish(modMsg);
@@ -477,7 +477,7 @@
*/
// create the entry with a given DN and unique ID
- addMsg = new AddMsg(gen.NewChangeNumber(),
+ addMsg = new AddMsg(gen.newChangeNumber(),
personWithUUIDEntry.getDN().toString(),
user1entryUUID, baseUUID,
personWithUUIDEntry.getObjectClassAttribute(),
@@ -492,7 +492,7 @@
// send a modify operation with a wrong unique ID but the same DN
mods = generatemods("telephonenumber", "02 01 03 05");
- modMsg = new ModifyMsg(gen.NewChangeNumber(),
+ modMsg = new ModifyMsg(gen.newChangeNumber(),
DN.decode(user1dn), mods, "10000000-9abc-def0-1234-1234567890ab");
broker.publish(modMsg);
@@ -514,7 +514,7 @@
// used above
DeleteMsg delMsg =
new DeleteMsg("cn=anotherdn,ou=People,dc=example,dc=com",
- gen.NewChangeNumber(), user1entryUUID);
+ gen.newChangeNumber(), user1entryUUID);
broker.publish(delMsg);
// check that the delete operation has been applied
@@ -529,7 +529,7 @@
*/
// create an entry with a given DN and unique ID
- addMsg = new AddMsg(gen.NewChangeNumber(),
+ addMsg = new AddMsg(gen.newChangeNumber(),
personWithUUIDEntry.getDN().toString(),
user1entryUUID, baseUUID,
personWithUUIDEntry.getObjectClassAttribute(),
@@ -543,7 +543,7 @@
entryList.add(resultEntry.getDN());
// create an entry with the same DN and another unique ID
- addMsg = new AddMsg(gen.NewChangeNumber(),
+ addMsg = new AddMsg(gen.newChangeNumber(),
personWithSecondUniqueID.getDN().toString(),
user1entrysecondUUID, baseUUID,
personWithSecondUniqueID.getObjectClassAttribute(),
@@ -560,11 +560,11 @@
// delete the entries to clean the database.
delMsg =
new DeleteMsg(personWithUUIDEntry.getDN().toString(),
- gen.NewChangeNumber(), user1entryUUID);
+ gen.newChangeNumber(), user1entryUUID);
broker.publish(delMsg);
delMsg =
new DeleteMsg(personWithSecondUniqueID.getDN().toString(),
- gen.NewChangeNumber(), user1entrysecondUUID);
+ gen.newChangeNumber(), user1entrysecondUUID);
broker.publish(delMsg);
resultEntry = getEntry(personWithUUIDEntry.getDN(), 10000, false);
@@ -578,7 +578,7 @@
* Simulate this by trying to add an entry below a DN that does not
* exist but with a parent ID that exist.
*/
- addMsg = new AddMsg(gen.NewChangeNumber(),
+ addMsg = new AddMsg(gen.newChangeNumber(),
"uid=new person,o=nothere,o=below,ou=People,dc=example,dc=com",
user1entryUUID,
baseUUID,
@@ -603,7 +603,7 @@
delMsg =
new DeleteMsg("uid=new person,ou=People,dc=example,dc=com",
- gen.NewChangeNumber(), "11111111-9abc-def0-1234-1234567890ab");
+ gen.newChangeNumber(), "11111111-9abc-def0-1234-1234567890ab");
broker.publish(delMsg);
resultEntry = getEntry(
DN.decode("uid=new person,ou=People,dc=example,dc=com"), 10000, true);
@@ -623,7 +623,7 @@
*/
ModifyDNMsg modDnMsg = new ModifyDNMsg(
- "uid=new person,ou=People,dc=example,dc=com", gen.NewChangeNumber(),
+ "uid=new person,ou=People,dc=example,dc=com", gen.newChangeNumber(),
user1entryUUID, baseUUID, false,
"uid=wrong, ou=people,dc=example,dc=com",
"uid=newrdn");
@@ -641,7 +641,7 @@
*/
modDnMsg = new ModifyDNMsg(
- "uid=wrong,ou=People,dc=example,dc=com", gen.NewChangeNumber(),
+ "uid=wrong,ou=People,dc=example,dc=com", gen.newChangeNumber(),
user1entryUUID, baseUUID, false, null, "uid=reallynewrdn");
broker.publish(modDnMsg);
@@ -658,7 +658,7 @@
*/
// add a second entry
- addMsg = new AddMsg(gen.NewChangeNumber(),
+ addMsg = new AddMsg(gen.newChangeNumber(),
user1dn,
user1entrysecondUUID,
baseUUID,
@@ -673,7 +673,7 @@
assertNotNull(resultEntry, "The add operation was not replayed");
// try to rename the first entry
- modDnMsg = new ModifyDNMsg(user1dn, gen.NewChangeNumber(),
+ modDnMsg = new ModifyDNMsg(user1dn, gen.newChangeNumber(),
user1entrysecondUUID, baseUUID, false,
baseDn.toString(), "uid=reallynewrdn");
broker.publish(modDnMsg);
@@ -689,7 +689,7 @@
// delete the entries to clean the database
delMsg =
new DeleteMsg("uid=reallynewrdn,ou=People,dc=example,dc=com",
- gen.NewChangeNumber(), user1entryUUID);
+ gen.newChangeNumber(), user1entryUUID);
broker.publish(delMsg);
resultEntry = getEntry(
DN.decode("uid=reallynewrdn,ou=People,dc=example,dc=com"), 10000, false);
@@ -702,7 +702,7 @@
new DeleteMsg("entryUUID = " + user1entrysecondUUID + "+" +
DN.decode(user1dn).getRDN().toString() +
",ou=People,dc=example,dc=com",
- gen.NewChangeNumber(), user1entrysecondUUID);
+ gen.newChangeNumber(), user1entrysecondUUID);
broker.publish(delMsg);
resultEntry = getEntry(
DN.decode("entryUUID = " + user1entrysecondUUID + "+" +
@@ -753,7 +753,7 @@
"Entry not added: ou=baseDn1,"+baseDn);
// - create Add Msg for user1 with parent entry 1 UUID
- addMsg = new AddMsg(gen.NewChangeNumber(),
+ addMsg = new AddMsg(gen.newChangeNumber(),
"uid=new person,ou=baseDn1,"+baseDn,
user1entryUUID,
getEntryUUID(DN.decode("ou=baseDn1,"+baseDn)),
@@ -933,7 +933,7 @@
*
* Start by testing the Add message reception
*/
- AddMsg addMsg = new AddMsg(gen.NewChangeNumber(),
+ AddMsg addMsg = new AddMsg(gen.newChangeNumber(),
personWithUUIDEntry.getDN().toString(),
user1entryUUID, baseUUID,
personWithUUIDEntry.getObjectClassAttribute(),
@@ -953,7 +953,7 @@
/*
* Test the reception of Modify Msg
*/
- modMsg = new ModifyMsg(gen.NewChangeNumber(), personWithUUIDEntry.getDN(),
+ modMsg = new ModifyMsg(gen.newChangeNumber(), personWithUUIDEntry.getDN(),
mods, user1entryUUID);
if (assured)
modMsg.setAssured();
@@ -969,7 +969,7 @@
* Test the Reception of Modify Dn Msg
*/
moddnMsg = new ModifyDNMsg(personWithUUIDEntry.getDN().toString(),
- gen.NewChangeNumber(),
+ gen.newChangeNumber(),
user1entryUUID, null,
true, null, "uid= new person");
if (assured)
@@ -986,7 +986,7 @@
* Test the Reception of Delete Msg
*/
delMsg = new DeleteMsg("uid= new person,ou=People,dc=example,dc=com",
- gen.NewChangeNumber(), user1entryUUID);
+ gen.newChangeNumber(), user1entryUUID);
if (assured)
delMsg.setAssured();
broker.publish(delMsg);
@@ -1150,7 +1150,7 @@
{
// Publish a delete message for this test entry.
DeleteMsg delMsg = new DeleteMsg(tmp.getDN().toString(),
- gen.NewChangeNumber(),
+ gen.newChangeNumber(),
uuid);
broker.publish(delMsg);
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ChangeNumberGeneratorTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ChangeNumberGeneratorTest.java
index 851d3dc..3a611a7 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ChangeNumberGeneratorTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ChangeNumberGeneratorTest.java
@@ -37,21 +37,21 @@
public class ChangeNumberGeneratorTest extends ReplicationTestCase
{
/**
- * Test the adjust method of ChangeNumberGenerator
+ * Test the adjust method of ChangeNumberGenerator
*/
@Test(dataProvider = "changeNumberData")
public void adjustTest()
{
ChangeNumberGenerator generator =
new ChangeNumberGenerator((short)5, TimeThread.getTime());
-
- ChangeNumber cn = generator.NewChangeNumber();
-
+
+ ChangeNumber cn = generator.newChangeNumber();
+
ChangeNumber cn1 =
new ChangeNumber(cn.getTime() + 5000, cn.getSeqnum(), (short) 6);
generator.adjust(cn1);
-
- ChangeNumber cn2 = generator.NewChangeNumber();
+
+ ChangeNumber cn2 = generator.newChangeNumber();
assertTrue((cn2.compareTo(cn1)>0),
"ChangeNumberGenerator generated an earlier ChangeNumber "
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ChangeNumberTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ChangeNumberTest.java
index ceba812..fdc1bf7 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ChangeNumberTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ChangeNumberTest.java
@@ -53,7 +53,7 @@
{TimeThread.getTime(), (short) 123, (short) 45}
};
}
-
+
/**
* Test ChangeNumber constructor
*/
@@ -71,7 +71,7 @@
}
/**
- * Test toString and constructor from String
+ * Test toString and constructor from String
*/
@Test(dataProvider = "changeNumberData")
public void ChangeNumberEncodeDecode(long time, int seq, short id)
@@ -80,11 +80,11 @@
// Create 2 ChangeNumber with the same data and check equality
ChangeNumber cn = new ChangeNumber(time,seq,id);
ChangeNumber cn2 = new ChangeNumber(cn.toString());
-
+
assertEquals(cn, cn2,
"The encoding/decoding of ChangeNumber is not reversible");
}
-
+
/**
* Create ChangeNumber
*/
@@ -256,51 +256,51 @@
new ChangeNumberGenerator((short) 0, TimeThread.getTime());
// Generate 2 changeNumbers and check that they are differents
- CN1 = cng.NewChangeNumber();
- CN2 = cng.NewChangeNumber();
+ CN1 = cng.newChangeNumber();
+ CN2 = cng.newChangeNumber();
assertTrue(CN1.compareTo(CN2) != 0);
// Generate a changeNumber separates by 10 milliseconds
// and check that they are differents
Thread.sleep(10);
- CN2 = cng.NewChangeNumber();
+ CN2 = cng.newChangeNumber();
assertTrue(CN1.compareTo(CN2) != 0);
// Generate a changeNumber separates by 300 milliseconds
// and check that they are differents
Thread.sleep(300);
- CN2 = cng.NewChangeNumber();
+ CN2 = cng.newChangeNumber();
assertTrue(CN1.compareTo(CN2) != 0);
// Adjust with the oldest CN
cng.adjust(CN1) ;
- CN2 = cng.NewChangeNumber();
+ CN2 = cng.newChangeNumber();
assertTrue(CN1.compareTo(CN2) != 0 );
// Adjust with the newest generated
cng.adjust(CN2) ;
CN1 = CN2;
- CN2 = cng.NewChangeNumber();
+ CN2 = cng.newChangeNumber();
assertTrue(CN1.compareTo(CN2) != 0 );
// Adjust with the newest generated (time + 300)
CN1 = new ChangeNumber(CN2.getTime() +300 ,CN2.getSeqnum(),
CN2.getServerId()) ;
cng.adjust(CN1) ;
- CN2 = cng.NewChangeNumber();
+ CN2 = cng.newChangeNumber();
assertTrue(CN1.compareTo(CN2) != 0 );
// Adjust with the newest generated (seqmun + 10)
CN1 = new ChangeNumber(CN2.getTime() ,CN2.getSeqnum() +10,
CN2.getServerId()) ;
cng.adjust(CN1) ;
- CN2 = cng.NewChangeNumber();
+ CN2 = cng.newChangeNumber();
assertTrue(CN1.compareTo(CN2) != 0 );
// Adjust with the newest generated (seqmun = 0XFFFF)
CN1 = new ChangeNumber(CN2.getTime() ,0XFFFF +10,CN2.getServerId()) ;
cng.adjust(CN1) ;
- CN2 = cng.NewChangeNumber();
+ CN2 = cng.newChangeNumber();
assertTrue(CN1.compareTo(CN2) != 0 );
}
}
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java
index 9322b2a..83e65a0 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java
@@ -105,8 +105,8 @@
ChangeNumberGenerator gen1 = new ChangeNumberGenerator((short) 1, state);
ChangeNumberGenerator gen2 = new ChangeNumberGenerator((short) 2, state);
- ChangeNumber cn1 = gen1.NewChangeNumber();
- ChangeNumber cn2 = gen2.NewChangeNumber();
+ ChangeNumber cn1 = gen1.newChangeNumber();
+ ChangeNumber cn2 = gen2.newChangeNumber();
state.update(cn1);
state.update(cn2);
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentStateTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentStateTest.java
index 89fab16..d39d45f 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentStateTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentStateTest.java
@@ -105,8 +105,8 @@
ChangeNumberGenerator gen1 = new ChangeNumberGenerator((short) 1, state);
ChangeNumberGenerator gen2 = new ChangeNumberGenerator((short) 2, state);
- ChangeNumber cn1 = gen1.NewChangeNumber();
- ChangeNumber cn2 = gen2.NewChangeNumber();
+ ChangeNumber cn1 = gen1.newChangeNumber();
+ ChangeNumber cn2 = gen2.newChangeNumber();
state.update(cn1);
state.update(cn2);
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/DbHandlerTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/DbHandlerTest.java
index f20a730..bd0bf55 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/DbHandlerTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/DbHandlerTest.java
@@ -79,9 +79,9 @@
new DbHandler((short) 1, DN.decode("o=test"), replicationServer, dbEnv);
ChangeNumberGenerator gen = new ChangeNumberGenerator((short)1, 0);
- ChangeNumber changeNumber1 = gen.NewChangeNumber();
- ChangeNumber changeNumber2 = gen.NewChangeNumber();
- ChangeNumber changeNumber3 = gen.NewChangeNumber();
+ ChangeNumber changeNumber1 = gen.newChangeNumber();
+ ChangeNumber changeNumber2 = gen.newChangeNumber();
+ ChangeNumber changeNumber3 = gen.newChangeNumber();
DeleteMsg update1 = new DeleteMsg("o=test", changeNumber1, "uid");
DeleteMsg update2 = new DeleteMsg("o=test", changeNumber2, "uid");
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
index 9428170..c54021c 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
@@ -101,7 +101,7 @@
socket.close();
ReplServerFakeConfiguration conf =
- new ReplServerFakeConfiguration(replicationServerPort, null, 0, 1, 0, 0, null);
+ new ReplServerFakeConfiguration(replicationServerPort, null, 0, 1, 0, 0, null);
replicationServer = new ReplicationServer(conf);
}
@@ -144,13 +144,13 @@
*/
firstChangeNumberServer2 = new ChangeNumber(time+ 1, 1, (short) 2);
secondChangeNumberServer2 = new ChangeNumber(time + 3, 2, (short) 2);
-
+
/*
- * Create a ChangeNumber between firstChangeNumberServer1 and
+ * Create a ChangeNumber between firstChangeNumberServer1 and
* secondChangeNumberServer1 that will not be used to create a
* change sent to the replicationServer but that will be used
- * in the Server State when opening a connection to the
- * ReplicationServer to make sure that the ReplicationServer is
+ * in the Server State when opening a connection to the
+ * ReplicationServer to make sure that the ReplicationServer is
* able to accept such clients.
*/
unknownChangeNumberServer1 = new ChangeNumber(time+1, 1, (short) 1);
@@ -314,7 +314,7 @@
newClientWithChanges(state, secondChangeNumberServer1);
}
-
+
/**
* Test with a client that has already seen a Change that the
* ReplicationServer has not seen.
@@ -454,7 +454,7 @@
for (int i = 0; i< TOTAL_MSG; i++)
{
DeleteMsg msg =
- new DeleteMsg("o=test,dc=example,dc=com", gen.NewChangeNumber(),
+ new DeleteMsg("o=test,dc=example,dc=com", gen.newChangeNumber(),
"uid");
server.publish(msg);
}
@@ -601,7 +601,7 @@
"localhost:" + ((i == 0) ? changelogPorts[1] : changelogPorts[0]));
ReplServerFakeConfiguration conf =
new ReplServerFakeConfiguration(changelogPorts[i], "changelogDb"+i, 0,
- changelogIds[i], 0, 100, servers);
+ changelogIds[i], 0, 100, servers);
replicationServer = new ReplicationServer(conf);
}
@@ -669,12 +669,12 @@
if (itest > 0)
{
socket.close();
-
+
SortedSet<String> servers = new TreeSet<String>();
servers.add("localhost:"+changelogPorts[0]);
ReplServerFakeConfiguration conf =
new ReplServerFakeConfiguration(changelogPorts[1], null, 0,
- changelogIds[1], 0, 0, null);
+ changelogIds[1], 0, 0, null);
changelogs[1] = new ReplicationServer(conf);
// Connect broker 2 to changelog2
@@ -829,7 +829,7 @@
count--;
DeleteMsg msg =
- new DeleteMsg("o=test,dc=example,dc=com", gen.NewChangeNumber(),
+ new DeleteMsg("o=test,dc=example,dc=com", gen.newChangeNumber(),
"uid");
broker.publish(msg);
}
--
Gitblit v1.10.0