org.forgerock / org.forgerock.opendj

19 Aug, 2013

2 commits

  • ccbdfce4   Avoided possible costly thread leaks in ReplicationServerDomain. ... Browse Code » 
    

ReplicationServerDomain.java:
Used AtomicReference for statusAnalyzer and monitoringPublisher.
As a consequence:
- Changed update*(), start*() and stop*() methods.
- Removed isRunning*() methods.

MonitoringPublisher.java:
Extracted getMessage() to make error messages more conherent.

ServerReader.java:
In run(), removed redundant code by checking whether the message is a RoutableMsg.
Extracted method logException().
In ServerReader.run(), moved some code to ServerHandler.put().
Code cleanups:
- inlined useless local variables
- removed useless use of "this" before method calls.

DataServerHandler.java, ECLServerHandler.java, ReplicationServerHandler.java:
Extracted method createReplServerStartMsg().

ServerHandler.java:
Renamed process(WindowProbeMsg) to replyToWindowProbe().
Made some instance members private.
Moved createReplServerStartMsg here.
In put(), moved decAndCheckWindow() call here from ServerReader.run().

WindowProbeMsg.java:
Fixed javadocs + simplified code.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9424 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 50d9c0b5   Enforced ReplicationServerDomain responsibilities by increasing encapsulation. ... Browse Code » 
    
ReplicationServer.java:
Added getConnectedRSUrls(), that aggregates code from ReplicationServerDomain.getChangelogs() and from runConnect().
In applyConfigurationChange(), moved code to ReplicationServerDomain for better encapsulation.

ReplicationServerDomain.java:
Renamed checkForDuplicateDS() into isAlreadyConnectedToDS().
Renamed checkForDuplicateRS() into isAlreadyConnectedToRS().
Moved getChangelogs() to ReplicationServer.
Made several methods private to reduce coupling and enforce class responsibilities.
Generalized the use of isRunningStatusAnalyzer() and isRunningMonitoringPublisher() to improved readability.
Inlined updateStatusAnalyzer() and updateMonitoringPublisher().
Moved code from ... to create updateDegradedStatusThreshold() and updateMonitoringPeriod().
In stopReplicationServers(), renamed parameter for increased readability.

DataServerHandler.java:
Inlined createStatusAnalyzer().

ServerHandler.java, ReplicationServerHandler.java:
Inlined createMonitoringPublisher().
In lockDomain(), removed useless else.
Code cleanup.

StatusAnalyzer.java:
Extracted isInterrupted().
Extracted getMessage() to make error messages more conherent.

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

15 Aug, 2013

1 commit

14 Aug, 2013

5 commits

  • 6947eea3   ReplicationServerDomain.java ... Browse Code » 
    Renamed directoryServers to connectedDSs.
Renamed replicationServers to connectedRSs.
Removed the useless getConnectedLDAPservers(), replaced with getConnectedDSs().
Renamed a few local variables.

DataServerHandler.java:
Consequence of removing to ReplicationServerDomain.getConnectedLDAPservers()
Extracted method changeStatus() from changeStatusFromStatusAnalyzer() and changeStatusForResetGenId().
Extracted method getStatusMachineEvent() from changeStatusForResetGenId().

InitOnLineTest.java
Consequence of removing to ReplicationServerDomain.getConnectedLDAPservers().
Removed useless try / catch / fail.
Extracted methods getCompletionTime(), assertAttributeValue().
Used Assertions.assertThat().

git-svn-id: https://svn.forgerock.org/opendj/trunk@9418 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • ca7e1746   - Added known issue OPENDJ-1051 in replication/externalchangelog_consistency tests (Upgrade mode) ... Browse Code » 
    - Updated i18n/datacomparison reference file
 


git-svn-id: https://svn.forgerock.org/opendj/trunk@9417 41b1ffd8-f28e-4786-ab96-9950f0a78031
    csovant
     
  • d53a5808   ChangeNumber.java: ... Browse Code » 
    In the ctor, renamed parameters.
In other methods, used early exit.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9416 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • dc7c17c6   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Code » 
    Removed ReplicationServerDomain.getReplicationServer() to follow the Law of Demeter: "Only talk to your immediate friends." to promote loose coupling.
Changed approxFirstMissingDate from Long object to long primitive.


ReplicationServerDomain.java:
Removed getReplicationServer().
Added getLocalRSMonitorInstanceName() and getLocalRSServerId().

*.java:
Used the newly added ReplicationServerDomain.getLocalRSMonitorInstanceName() and ReplicationServerDomain.getLocalRSServerId().

LightweightServerHandler.java:
Removed getLocalRSMonitorInstanceName().


MonitorMsg.java, MonitorData.java:
Changed firstMissingDate from Long object to long primitive.
Used StringBuilder in toString().

SynchronizationMsgTest.java
Changed approxFirstMissingDate from Long object to long primitive.
Extracted methods newList(), newSet(), getEntryAttributes(), assertAttributesEqual().
Used assertEquals() instead of assertTrue().

git-svn-id: https://svn.forgerock.org/opendj/trunk@9415 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 29ad2aa6   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Code » 
    Removed avoidable references to replicationServerDomain.getReplicationServer().
Code cleanups:
- collapsed if statements
- applied early exits
- Replaced useless use of StringBulders with string concatenations
- Removed useless parentheses


*ServerHandler.java:
Replaced calls to this.replicationServerDomain.getReplicationServer() with directly using this.replicationServer .

DataServerHandler.java:
Inlined local variables.
Removed useless catch.

ECLServerHandler.java:
Extracted method releaseIterator().

LightweightServerHandler.java:
Extracted method getLocalRSMonitorInstanceName().

ReplicationServerHandler.java
In isRemoteLDAPServer(), renamed parameter.


MessageHandler.java:
Extracted methods collectAllIteratorsWithChanges(), addIteratorIfNotEmpty(), releaseAllIterators().

ReplicationServerDomain.java
Renamed replicationServer to localReplicationServer.
In put(), renamed id to serverId + extracted method publishMessage().
In getChangelogIterator(), renamed parameter.
Extracted methods replyWithMonitorMsg(), replyWithUnroutableMsgType(), forwardMsgToAllServers(), replyWithUnreachablePeerMsg() from process().
Renamed stopDbHandlers() to shutdownDbHandlers().
Extracted isServerConnected() from getEligibleCN().



DbHandler.java, JEReplicationIterator.java:
Renamed parameter.

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

13 Aug, 2013

13 commits

  • b1466a91   Fix checkstyle ... Browse Code » 
    git-svn-id: https://svn.forgerock.org/opendj/trunk@9413 41b1ffd8-f28e-4786-ab96-9950f0a78031
    ludo
     
  • 940d10e3   Major code refactoring - preparing the ground to OPENDJ-1030. ... Browse Code » 
    Thanks to JN for his help :)

git-svn-id: https://svn.forgerock.org/opendj/trunk@9412 41b1ffd8-f28e-4786-ab96-9950f0a78031
    violette
     
  • bddf83a6   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Code » 
    Moved all JE changelog related classes to the new package org.opends.server.replication.server.changelog.je



DbHandler.java, DraftCNData.java, DraftCNDB.java, DraftCNDbHandler.java, DraftCNDbIterator.java, JEReplicationIterator.java, package-info.java, ReplicationData.java, ReplicationDB.java, ReplicationDbEnv.java, ReplicationDraftCNKey.java, DbHandlerTest.java, DraftCNDbHandlerTest.java:
Moved to package org.opends.server.replication.server.changelog.je

ReplicationServer.java:
Updated the imports.
Made getTrimAge() public.
Removed use of "this" from method invocation.
Moved handleUnexpectedChangelogException() to ReplicationDbEnv.

DraftCNDB.java, ReplicationDB.java:
Moved handleUnexpectedDatabaseException() to ReplicationDbEnv.

ReplicationDbEnv.java:
Moved handleUnexpectedChangelogException() here from ReplicationServer, and renamed it to shutdownOnException().
Moved handleUnexpectedDatabaseException() here from DraftCNDB and ReplicationDB, and renamed it to shutdownOnException().

ECLServerHandler.java, ReplicationServerDomain.java, ExternalChangeLogTest.java:
Updated the imports.


git-svn-id: https://svn.forgerock.org/opendj/trunk@9411 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • dccedb39   Update community SSO link ... Browse Code » 
    git-svn-id: https://svn.forgerock.org/opendj/trunk@9410 41b1ffd8-f28e-4786-ab96-9950f0a78031
    mark
     
  • 49431fe4   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Code » 
    Extracted interface org.opends.server.replication.server.changelog.api.ReplicationIterator from org.opends.server.replication.server.ReplicationIterator and used it in all the places where the class was used.
Renamed ReplicationIterator class to JEReplicationIterator.
Moved ReplicationIteratorComparator from package org.opends.server.replication.server to org.opends.server.replication.server.changelog.api.

MessageHandler.java:
Minimal code cleanup.


git-svn-id: https://svn.forgerock.org/opendj/trunk@9409 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 5824d62b   ReplicationIterator.java: ... Browse Code » 
    In next(), removed useless local variable.
Renamed instance field from dbh to dbHandler.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9408 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 6422e8de   Fix checkstyle ... Browse Code » 
    git-svn-id: https://svn.forgerock.org/opendj/trunk@9407 41b1ffd8-f28e-4786-ab96-9950f0a78031
    ludo
     
  • 5cbc3c56   ExternalChangelogTest.java: ... Browse Code » 
    Extracted constants SERVER_ID_1 and SERVER_ID_2.
Renamed getAttributeValue() to getAttributeValueOrNull().
Extracted new getAttributeValue() from getAttributeValueOrNull(), checkValue() and checkPossibleValues().
In ECLGetEligibleCountTest(), extracted constants to better explicit the code + removed the count local variable + extracted method now()
Removed useless code blocks.

ReplicationServerDomain.java:
In getEligibleCount(), removed a useless if statement.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9406 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 4b173f5a   Fixes for OPENDJ-1111 + SVR4 specific fix related to OPENDJ-1066. ... Browse Code » 
    Reviewed in CR 2142.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9405 41b1ffd8-f28e-4786-ab96-9950f0a78031
    ludo
     
  • b3cea6d7   TimeThread.java: ... Browse Code » 
    Converted comments to javadoc.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9404 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 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
     
  • 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
    ludo
     
  • 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
    JnRouvignac
     

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
     
  • 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
    JnRouvignac
     
  • 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
    JnRouvignac
     

11 Aug, 2013

1 commit

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
    JnRouvignac
     
  • 05ed1ad6   Minor code refactoring. ... Browse Code » 
    git-svn-id: https://svn.forgerock.org/opendj/trunk@9395 41b1ffd8-f28e-4786-ab96-9950f0a78031
    violette
     
  • 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
    JnRouvignac
     
  • 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
    JnRouvignac
     
  • 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
    JnRouvignac
     
  • 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
    JnRouvignac
     
  • 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
    JnRouvignac
     
  • 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
    JnRouvignac
     

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
     
  • 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
    JnRouvignac
     
  • 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
    JnRouvignac
     
  • 0491f5c3   Minor code cleanup ... Browse Code » 
    git-svn-id: https://svn.forgerock.org/opendj/trunk@9385 41b1ffd8-f28e-4786-ab96-9950f0a78031
    violette
     
  • 18ed015f   Trivial checkstyle fix. ... Browse Code » 
    git-svn-id: https://svn.forgerock.org/opendj/trunk@9384 41b1ffd8-f28e-4786-ab96-9950f0a78031
    violette
     

07 Aug, 2013

2 commits