org.forgerock / org.forgerock.opendj

13 Aug, 2013

4 commits

b3cea6d7 TimeThread.java: ... Browse Code »

Converted comments to javadoc.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9404 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-13 09:16:46 +0000

22883610 Another fix for OPENDJ-1069 (removal of instance.loc) ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9403 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
ludo
2013-08-13 08:17:19 +0000

86b5361f Fix for OPENDJ-1069, no longer delivering the instance.loc file. Now that the .b… ... Browse Code »

…at files can cope with the absence of the file, we can remove it completely.
 CR-2142


git-svn-id: https://svn.forgerock.org/opendj/trunk@9402 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-13 08:02:29 +0000

82b1c274 ivy.xml: ... Browse Code »

Upgraded to grizzly 2.3.5 which removes grizzly-rcm dependency :)

git-svn-id: https://svn.forgerock.org/opendj/trunk@9401 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-13 07:59:13 +0000

12 Aug, 2013

3 commits

bed8de21 Fix windows batch if instance.loc is missing - OPENDJ-1069 ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9400 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
ludo
2013-08-12 15:40:53 +0000

a9d10551 OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Code »

Hid low level JE's DatabaseException and ReplicationDBException from replication higher level code. They have been replaced by the newly created ChangelogException.

Tidied up the exception handling by throwing or catching more specific exceptions.
Moved some code to protect them with try / catch.
Adding a few catch for specific handling of ChangelogException.
Threw ChangelogException instead of Exception.
Added handleUnexpectedDatabaseException() methods.

ReplicationDBException.java: REMOVED (now useless)

replication*.properties:
Removed ERR_COULD_NOT_INITIALIZE_DB, not adding anything to ERR_COULD_NOT_READ_DB.

Removed "this." from member method invocations.
Used Integer.parseInt().
Used StaticUtils.close().

git-svn-id: https://svn.forgerock.org/opendj/trunk@9399 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-12 15:22:03 +0000

86f153af ExternalChangeLogTest.java: ... Browse Code »

Removed another 200 lines.
Extracted several methods: newSet(), generateChangeNumbers(), checkDn(), assertDnEquals(), debugAndWriteEntries(), createDomain(), runDeleteOperation(), assertOnlyDoneMsgReceived.
Removed useless / unused / plain wrong code.
Removed commented out code.
assertTrue() => assertEquals().
Used assertj assertThat().

git-svn-id: https://svn.forgerock.org/opendj/trunk@9398 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-12 10:16:57 +0000

11 Aug, 2013

1 commit

43f2794d CR-2061 Fix for OPENDJ-979: Use JCite rather than copy/paste to cite Java example code ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9397 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
mark
2013-08-11 10:07:18 +0000

09 Aug, 2013

8 commits

bf5264c3 ExternalChangeLogTest.java: ... Browse Code »

In ECLTwoDomains(), inverted 2 parameters to fix another test failure.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9396 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-09 15:32:17 +0000

05ed1ad6 Minor code refactoring. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9395 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
violette
2013-08-09 15:21:27 +0000

5551ef8d ExternalChangeLogTest.java: ... Browse Code »

In ECLAfterChangelogTrim(), inverted 2 parameters to fix a test failure.
Used AutoRefactor plugin.
Extracted method waitForClose().

git-svn-id: https://svn.forgerock.org/opendj/trunk@9394 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-09 14:57:44 +0000

48689015 Fixed a test. ... Browse Code »

Improved javadocs.


ExternalChangeLogTest.java:
In ECLTwoDomains(), fixed the test.
Extracted runModifyOperation() and createMods().



PersistentSearchChangeType.java, ChangeOperationType.java:
Improved javadocs.
Increased vertical density.
Code cleanup.

LDAPReplicationDomain.java:
Added comments / javadocs.

DraftCNDB.java:
Used static import to put if conditions on just one line.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9393 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-09 14:41:10 +0000

fcd7b9f8 ExternalChangeLogTest.java: ... Browse Code »

Knocked off 500 lines of code by extracting various methods.
This makes the code easier to read even though it is still sometimes puzzling.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9392 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-09 13:58:32 +0000

4d8e5269 ReplicationDB.java: ... Browse Code »

Collapsed try/finally embedded in try/catch into single try/catch/finally statements.
Used a static import for OperationStatus.SUCCESS to help readability with if statement conditions.
In count(), moved the cursor variable inside findFirstCounterRecordAfterStartPoint() and findFirstCounterRecordBeforeStopPoint() to ease readability.
In ReplServerDBCursor ctor, removed an uneeded else statement (because of an early exit)

git-svn-id: https://svn.forgerock.org/opendj/trunk@9391 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-09 09:59:17 +0000

9912beff ExternalChangeLogTest.java: ... Browse Code »

Removed 400 lines of code by:
- Used TestCaseUtils.findFreePort().
- Removed try / catch / fail test anti pattern + let the exceptions go up the stack.
- Extracted methods stop(), assertEntries().
- Used interfaces instead of concrete classes.
- Converting comments to javadocs.
- Removed useless parameters in readLastCookie().
- Removed unnecessary creations of new String objects.
- Removed unnecessary calls to toString() in string concatenations.
- Reduced variable scopes.
- Put code on one line to ease reading.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9390 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-09 09:32:30 +0000

4990337e *Test*.java: ... Browse Code »

Used TestCaseUtils.findFreePort() instead of TestCaseUtils.bindFreePort().
Used StaticUtils.close().

Various refactorings:
- Extracted a few simple methods
- Comments to javadocs
- Removed dead code
- Inlined unnecessary local variables

git-svn-id: https://svn.forgerock.org/opendj/trunk@9389 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-09 08:34:00 +0000

08 Aug, 2013

5 commits

a51de453 Fix checkstyle issue ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9388 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
ludo
2013-08-08 16:22:13 +0000

dc56f563 ReplicationServerDomain.java: ... Browse Code »

Changed getCount() return type from int to long (This change goes along with r9386).
Extracted method addUpdate(), isDifferentGenerationId(), isSameGenerationId(), collectRSsEligibleForAssuredReplication(), toRSInfo().
In many places, renamed sid to serverId.
Various cleanups:
- converted comments to javadoc
- added curly braces around if bodies
- collapsed if statements
- used interfaces instead of concrete classes
- removed useless parentheses
- removed useless 'this' qualifier in non static method calls
- put code on one line where it fits


MessageHandler.java:
In add(), removed unused parameter MessageHandler.
In getOlderUpdateCN(), removed useless reassignment of a local variable.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9387 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-08 15:16:13 +0000

6bcc4799 Big refactoring of ReplicationDB to make it readable. ... Browse Code »

Changed count() return type from int to long.
Removed a useless parameter from ReplicationIterator ctor.
Various code cleanups in other classes.



ReplicationDB.java:
Extracted methods:
- intializeCounters() from ctor.
- insertCounterRecordIfNeeded() and newCounterRecord() from addEntries().
- toChangeNumber(byte[])
- getRegularRecord() from getPreviousChangeNumber().
- findFirstCounterRecordAfterStartPoint(), findFirstCounterRecordBeforeStopPoint() and computeDistance() from count().
Created method createReplicationKey() and moved ReplicationKey code there.
In readFirstChange(), readLastChange(), getPreviousChangeNumber(), 
Renamed closeLockedCursor() to closeAndReleaseReadLock().
Renamed isaCounter() to isACounterRecord().
Changed count() return type from int to long.

ReplicationKey.java: REMOVED
Moved code to ReplicationDB.createReplicationKey().


ReplicationIterator.java
In ctor, removed unused parameter id.

DbHandler.java:
Consequence of the change to ReplicationIterator ctor.
Consequence of the change to ReplicationDB.count().

DbHandlerTest.java:
Consequence of the change to ReplicationDB.count().
Extracted methods configureReplicationServer(), getReplicationDbPath(), createDirectory(), assertFoundInOrder(), assertNotFound().

TestCaseUtils.java:
Added findFreePort(), findFreePorts().
bindFreePort() now delegates to bindPort().


ReplicationDbEnv.java:
Renamed local variables for increased readability.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9386 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-08 13:37:11 +0000

0491f5c3 Minor code cleanup ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9385 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
violette
2013-08-08 12:12:51 +0000
18ed015f Trivial checkstyle fix. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9384 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
violette
2013-08-08 08:49:15 +0000

07 Aug, 2013

7 commits

ddc27d67 Fix variable name typo. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9382 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-08-07 11:13:25 +0000
48c7591f Rename ServerState.getMaxChangeNumber(int) to ServerState.getChangeNumber(int). ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9381 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-08-07 11:04:11 +0000

fbf69b31 ReplicationDbEnv.java: ... Browse Code »

Extracted methods readDomainBaseDNGenerationIDRecords(), readServerIdDomainBaseDNRecords(), toInt(), toLong() and toString() from start().
Extracted method putInStateDBIfNotExist() from getOrAddDb().
Extracted method deleteFromStateDB() from clearGenerationId() and clearServerId().

git-svn-id: https://svn.forgerock.org/opendj/trunk@9380 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-07 11:03:39 +0000

94dba9cd HTTPConnectionHandler.java: ... Browse Code »

HTTPServer.stop() has been deprecated, use HTTPServer.shutdownNow() instead.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9379 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-07 09:16:39 +0000

2aaff91a DbHandler.java: ... Browse Code »

In getChanges(), simplified the code.
In flush(), simplified the code and better explicited the role of the loop.
Extracted encode() method.
ArrayList => List.
Other general code cleanups.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9378 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-07 08:51:08 +0000

b3ac79fe ModifyConflictTest.java: ... Browse Code »

Inlined the testModify() method that does not take a Modification parameter.
In the remaining testModify() method, moved the Modification parameter to be the last parameter.
In buildMod(), removed a condition that became unnecessary after modifying the method calls to not pass down null.
Transformed multi-line comments into one line comments where it fits.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9377 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-07 07:52:05 +0000

a30684e4 ModifyConflictTest.java: ... Browse Code »

In testHistorical(), removed the EntryHistorical parameter (unused).
Merged buildModWith2Vals() into buildMod().
Extracted method buildSyncHist() and assertContainsOnlyValues().
Removed useless try / catch.
Removed useless if statements.
Put all the calls to testModify() over one line only to ease readability.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9376 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-07 07:21:10 +0000

06 Aug, 2013

10 commits

b5f06daa CR-2124 Fix OPENDJ-1016 Control panel does not follow static group recommendation from documentation ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9375 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
cjr
2013-08-06 15:39:09 +0000
7eed43d8 CR-2123 OPENDJ-1068 create resources for rpm packaging ... Browse Code »
```
- added init.d script to RPM package.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9374 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
violette
2013-08-06 15:23:03 +0000

ff432d5a ReplicationServer.java: ... Browse Code »

In getDomainIterator(), never return null.
Extracted methods findExportContainers() and findSearchContainers()
Comments => javadocs.
Concrete classes => interfaces.

*.java:
Removed null checks on the result of ReplicationServer.getDomainIterator().

git-svn-id: https://svn.forgerock.org/opendj/trunk@9373 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-06 14:33:14 +0000

4a925446 DraftCNDbIterator.java: ... Browse Code »

In next(), got rid of an Exception that should not happen.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9372 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-06 13:54:25 +0000

0c1429ad ECLServerHandler.java: ... Browse Code »

In getNextECLUpdate():
- used local variables for the oldestChange to ease readability
- removed if (searchPhase == INIT_PHASE) in the while loop
- removed the suffix local variable in favour of reading on the ECLUpdateMsg object
- extracted method assignDraftCN()
Renamed storeNewChange() to assignNewDraftCNAndStore() and removed all parameters but the ECLUpdateMsg parameter.

DraftCNDbHandler.java:
Used isEmpty() in the class.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9371 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-06 13:45:03 +0000

25712ee6 ECLServerHandler.java: ... Browse Code »

In initializeCLSearchFromDraftCN(), removed useless double assignment of draftCompat instance member.
In findCookie(), created separate key local variables to query the drafCNDB to increase readability and reduce risk of errors.


DraftCNDbHandler.java:
Fixed checkstyle error.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9370 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-06 13:14:20 +0000

fe6ae40f ECLServerHandler.java: ... Browse Code »

Extracted method findCookie() and use the early exit technique to make the code hopefully easier to read. Also removed useless comments.
Used DraftCNDbHandler.isEmpty().
Made several methods private.

DraftCNDbHandler.java:
Added isEmpty().

git-svn-id: https://svn.forgerock.org/opendj/trunk@9369 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-06 12:49:35 +0000

718ae0ca ECLServerHandler.java: ... Browse Code »

Many small changes to improve the readability of this code:
Renamed getOldestChangeFromDomainCtxts() to findOldestChangeFromDomainCtxts() and return the actual DomainContext object instead of its index.
Extracted methods initializeChangelogSearch() and hasCookieBeenTrimmedFromDB().
Renamed initializeCLDomCtxts() to initializeChangelogDomainCtxts().
Reduced variable scopes.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9368 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-06 10:58:39 +0000

be97ba24 Checkstyle I love you. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9367 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
JnRouvignac
2013-08-06 10:03:06 +0000

4867159f ECLServerHandler.java: ... Browse Code »

Extracted methods storeNewChange() to remove duplication and areSameChange() to ease readability.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9366 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-06 10:02:00 +0000

05 Aug, 2013

2 commits

35ea2dcb Code cleanup. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@9365 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
JnRouvignac
2013-08-05 15:14:12 +0000

5b8fab5a Code cleanup. ... Browse Code »


MessageHandler.java:
Removed instance members replicationServerId and replicationServerURL from the classes in org.opends.server.replication.server package (duplicated information already held on replicationServer).
Added getReplicationServerURL().

ECLServerHandler.java:
Removed duplicated code in ctors.
In getNextECLUpdate(), tried to simplify reading of the code.

*.java:
Changed code as a consequence of the changes to MessageHandler.
Made some fields private.
In getMonitorData(), changed return type from ArrayList to List.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9364 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-08-05 15:03:12 +0000