org.forgerock / org.forgerock.opendj

30 Sep, 2013

2 commits

  • 64f43be2   Ludo prefer to not have CSNGenerator.newCSNs() in the production code because it… ... Browse Dir » 
    … should never be called this way in production, so I moved it back to tests.

CSNGenerator.java:
Moved newCSNs() to DbHandlerTest.

CSNGeneratorTest.java:
Renamed newCSNs() test to newCSN()

DbHandlerTest.java:
Moved newCSNs() here from CSNGenerator.

DraftCNDbHandlerTest.java:
Used DbHandlerTest.newCSNs().

git-svn-id: https://svn.forgerock.org/opendj/trunk@9621 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • b5d74be5   Various little changes. ... Browse Dir » 
    
ChangelogDB.java:
Updated javadoc for getCSNAfter().


CSNGenerator.java
Added newCSNs(int) to generate a certain number of CSNs in one go. It is very useful in tests.

CSNGeneratorTest.java
Added a test for newCSNs(int).

ReplicationServer.java:
In getChangelogDB(), weakened visibility from private to default for unit tests access.

JEChangelogDB.java:
In getOrCreateDbHandler(), weakened visibility from private to default for unit tests access.

DbHandlerTest.java:
Cleaned up the tests by relying on production code methods cleanups.
Used CSNGenerator(.newCSNs().
Added newDbHandler(), testGenerateCursorFrom().
Renamed/inlined a few local variables.

DraftCNDbHandlerTest.java:
Cleaned up the tests by relying on production code methods cleanups.
Used CSNGenerator(.newCSNs().
Added newDbHandler().


PendingChange.java, ExternalChangeLogTest.java:
Renamed "changeNumber" to "csn".

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

27 Sep, 2013

1 commit

  • 56a0d990   Fixed the failing nightly test GenerationIdTest.testSingleRS(). ... Browse Dir » 
    
GenerationIdTest.java:
In testSingleRS(), called again ReplicationServer.remove() instead of ReplicationServerTestCase.remove() because the test does not expect the DB to be wiped out.
Changed all protected keywords to private since it is never subclassed.
Renamed testEntriesInDb() to countUpdatedEntriesInDb().
Removed useless try / catch and let the exceptions go up.
Replaced uses of assertTrue() with the appropriate assert* method.
Changed the return type of createAddMsg() to return the appropriate type.
Extracted method assertNoMessageReceivedBadGenId(), waitForStableGenerationId().

ReplicationTestCase.java:
In addTestEntriesToDB(), used varargs.
Removed outdated openReplicationSession().
Removed useless try / catch and let the exceptions go up.

ReplicationServerTest.java:
Extracted method sendAndReceiveDeleteMsg() and newServerState().
Used Arrays.asList().

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

26 Sep, 2013

5 commits

  • a6df0d06   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    
Changes after review from Matt.


ChangelogDB.java:
Added removeDB().
Renamed clearDomain() to removeDomain().
In getCursorFrom(), never return a null Cursor anymore.
Updated many javadocs.



MessageHandler.java, ReplicationBackend.java:
Removed null checks for cursor (consequence of the changes to ChangelogDB)

ReplicationServerDomain.java, JEChangelogDB.java, JEReplicaDBCursor.java:
Consequence of the changes to ChangelogDB.


ReplicationServer.java:
Added removeDb().
Removed getDbDirName(), superseded in usage by removeDb().

ReplicationTestCase.java, ReplicationServerTest.java:
Consequence of the change to ReplicationServer.


DbHandler.java, ReplicationDB.java:
Renamed setCounterWindowSize() to setCounterRecordWindowSize() + updated javadoc.

DbHandlerTest.java:
Improved the tests.
Added testGetCountNoCounterRecords() to assess code behaviour.
Extracted method assertCount()

CSNGenerator.java:
Fixed ugly parameter name.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9609 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • ced21c19   Code cleanup. ... Browse Dir » 
    
LDAPReplicationDomain.java:
In buildAndPublishMissingChanges(), removed ReplicationBroker parameter and used broker field instead.


*Test.java:
Removed try / catch / fail test anti pattern.
Inlined local variables.

AssuredReplicationPluginTest.java:
Extracted methods assertBlockedForLessThanTimeout() assertBlockedLongerThanTimeout(), 
Inlined sleep().
In getErrorsByServers(), improved the code.

ReplicationServerTest.java:
Split changelogChaining() test into changelogChaining0() and changelogChaining1() to match the previous double testing + then simplified the code.
Extracted methods receiveReplicationMsgs(), assertOnlyTopologyMsgsReceived().
Used CSNGenerator.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9606 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • cbad20ff   AssuredReplicationPluginTest.java: ... Browse Dir » 
    Fixed ConcurrentModificationException.
Fixed wrong expected value (copy/paste was here).

git-svn-id: https://svn.forgerock.org/opendj/trunk@9603 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 1fa2ad70   AssuredReplicationPluginTest.java: ... Browse Dir » 
    Factorized common code in tests:
- Added inner class MonitorAssertions with fluent interface to help assert the monitor attribute values.
- Extracted methods assertNoServerErrors(), assertServerErrorsSafeDataMode(), assertServerErrorsSafeReadMode().

git-svn-id: https://svn.forgerock.org/opendj/trunk@9602 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 75e7b9ca   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    String baseDn => DN baseDN

The change mostly affects package org.opends.server.replication.protocol and dependent classes.


ModifyCommonMsg.java:
In getMods(), called decodeMods()

ReplicationTestCase.java:
Converted removeDomain(Entry) to removeDomain(Entry...).

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

25 Sep, 2013

3 commits

  • 4a29c6e0   ReplicationServerDomain.java: ... Browse Dir » 
    Extracted toServerState() method.
Renamed getDbServerState() to getLatestServerState().

ReplicationDomainCfgDefn_fr.properties:
Upgraded "property.replication-server.description" to match the latest english description.

*.java:
Consequence of renaming ReplicationServerDomain.getDbServerState().

git-svn-id: https://svn.forgerock.org/opendj/trunk@9600 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • f9746fe6   OPENDJ-1134 (CR-2355) Introduce a class in replication for encapsulating host+port combinations ... Browse Dir » 
    Now the replication code uses HostPort class for comparisons instead of "host:port" Strings.
Changed all the HostPort variable/parameter names to *Address instead of *URL. Left all the relevant String variable/parameter names to *URL.


HostPort.java:
Removed LocalAddress(String), not used anymore.
Moved getLocalAddress() here from ReplicationServer.
Created localAddress() static method.
Extracted method toInetSocketAddress() and moved it here.

ReplicationServer.java:
Created converting method toHostPorts() + used it everywhere replicationServerUrls was accessed.
Replaced getNormalizedLocalURL() and normalizeServerURL() with simply calling HostPort.localAddress() and HostPort.valueOf().
In getConnectedRSUrls(), changed return type from Set<String> to Set<HostPort>.
In connect() and disconnectRemovedReplicationServers(), used HostPort as a parameter instead of String.

ReplicationServerDomain.java:
In stopReplicationServers(), used HostPort as a parameter instead of String.

ReplicationServerHandler.java:
Extracted method toServerAddressURL().

ReplicationBroker.java:
Consequence of the change to HostPort.


ReplSessionSecurity.java:
In isSslEncryption() removed unused parameter.
Used StaticUtils.close().

ReplicationServerConfiguration.xml, ReplicationServerCfgDefn.properties:
Added precisions on how to specify the "replication-server" property.

ReplicationServerDynamicConfTest.java, ReplServerFakeConfiguration.java:
Updated because this test was failing.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9599 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • f83d8df3   Fix OPENDJ-18 - keystore import failes due to empty PIN ... Browse Dir » 
    Review CR-2353

* Removed constraints on the mandatory presence of a PIN, to allow use of empty PIN. 
   These contraints were implemented in several places :
  - configuration files : FileBasedKeyManagerProviderConfiguration.xml, PKCS11KeyManagerProviderConfiguration.xml
  - corresponding provider classes : FileBasedKeyManagerProvider.java, PKCS11KeyManagerProvider.java
  - setup tool : CertificateManager.java, InstallDS.java (for CLI), SecurityOptionsDialog.java (for GUI) 

* Removed corresponding admin messages that are no more used in FileBasedKeyManagerProviderCfgDefn.properties and PKCS11KeyManagerProviderCfgDefn.properties
* Removed corresponding messages that are no more used in extension.properties and quicksetup.properties
* Added management of issue JDK-6879539 that prevents usage of empty PIN. This issue occurs on JDK older than JDK7.
* Modified unit tests according to new behavior : FileBasedKeyManagerProviderTestCase.java, CertificateManagerTestCase.java

* Added a new utility method StaticUtils#stackTraceContainsCause to check if an exception contains a given cause.



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

24 Sep, 2013

5 commits

  • 4081bc61   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    Changes after review from Matt.

*.java:
Changed terminology for easier reading:
- First => Oldest
- Last => Newest

git-svn-id: https://svn.forgerock.org/opendj/trunk@9589 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 1ada2672   LDAPURLTest.java: ... Browse Dir » 
    Silencing annoying warnings in Continuous Integration.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9588 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 7f7612f4   HostPortTest.java: ... Browse Dir » 
    Silencing annoying warnings in Continuous Integration.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9587 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 64328b5a   Replication tests cleanup and consolidation. ... Browse Dir » 
    
ReplicationTestCase.java
Added remove(ReplicationServer...) and stop(ReplicationBroker...).

*Test.java:
Used the new methods from ReplicationTestCase.
Used Arrays.fill().
Removed various redundant methods that had been extracted in the past:
- GroupIdHandshakeTest.clear()
- ReplicationServerFailoverTest.clear()
- ExternalChangeLogTest.stop()
- ReplicationServerTest.stop()
- ReplicationServerTest.removeRsAndChangeLog()
- ReplicationDomainTest.remove())

AssuredReplicationServerTest.java:
Removed all the rs*Port fields, replaced by rsPorts.
Removed all the fakeRd* fields, replaced by fakeRDs.
Extracted methods disableService(), shutdown(), assertFakeDSReceivedAndAcked(), assertFakeRDNbReceivedUpdates(), assertFakeRSNbReceivedUpdates(), checkDSNothingReceivedOrSent(), assertContainsOnly().
Used more the checkDSSentAndAcked(), checkDSReceivedAndAcked().
Inlined on createFakeReplicationDomain().
Removed all sorts of assertNotNull() where the code could never be null.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9582 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • c7f19721   OPENDJ-1134 (CR-2338) Introduce a class in replication for encapsulating host+port combinations ... Browse Dir » 
    HostPort.java:
Improved javadocs.
Improved host normalization for and used remote IP addresses for remote hosts (complies with code from ReplicationServer.java.disconnectRemovedReplicationServers()).
Renamed normalizedHost() tpo normalizeHost().
Removed trimming for serverURLs.
In valueOf(), added a special case to reject unbracketed IPV6 addresses.
Extracted constant LOCALHOST to avoid typos.
Reworked the code from isLocalAddress(), equals(), hashCode().

HostPortTest.java:
Reworked some tests.
Added new tests.

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

23 Sep, 2013

4 commits

  • 2c3ea1a5   LDAPURLTest.java: ADDED ... Browse Dir » 
    LDAPURL.java:
Weakened urlDecode() visibility from private to package to allow easy unit testing.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9578 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 3fa9e1af   OPENDJ-1134 (CR-2338) Introduce a class in replication for encapsulating host+port combinations ... Browse Dir » 
    Let's make the build happier.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9576 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • fb30a900   OPENDJ-1134 (CR-2338) Introduce a class in replication for encapsulating host+port combinations ... Browse Dir » 
    Augmented HostPort class to support the use cases mentioned in OPENDJ-1134.
Moved host splitting and port range validation to HostPort class.


HostPort.java:
Added valueOf() to parses a "host:port" URL + Added extractPort(), normalizePort(), normalizedHost(), removeExtraChars().
Moved isLocalAddress() code here from StaticUtils.
Added normalizedHost field, toNormalizedString() and toString(String) + modified hashCode() and equals() to ensure stability of the results returned by hashCode() and equals().
Added allAddresses() to hide HostPort(int).
Moved isEquivalentTo() code here from ReplicationBroker.isSameReplicationServerUrl().

HostPortTest.java:
Added.

StaticUtils.java:
Moved isLocalAddress() and related code to the HostPort class.

ReplicationBroker.java:
Moved some isSameReplicationServerUrl() to HostPort as isEquivalentTo().

*.java:
Used the new HostPort ctor everywhere.
It simplified the code in many places and also helped remove duplicated code.

ComputeBestServerTest.java:
Added ports to serverURLs to ensure tests still pass.

*Test.java:
Removed the test anti-pattern try/catch/fail.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9575 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • a2594ae2   ComputeBestServerTest.java: ... Browse Dir » 
    Refactored code to make it more readable.
Extracted several methods to reduce code duplication.
Inlined local variables.
Extracted constants.

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

19 Sep, 2013

3 commits

  • f7fd2332   Add known issue tag for issue OPENDJ-1135 ... Browse Dir » 
    git-svn-id: https://svn.forgerock.org/opendj/trunk@9559 41b1ffd8-f28e-4786-ab96-9950f0a78031
    csovant
     
  • b1eb1e54   Tried fixing random failures for ECLReplicationServerFullTest() in Jenkins. ... Browse Dir » 
    ExternalChangeLogTest.java:
Reverted the @Test annotation added in r9543.
Used different backendId and baseDN from other tests to avoid clashing tests in concurrent test runs.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9557 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • bd3b5c00   OPENDJ-1149 (CR-2334) Passwords should not be held in memory for the lifetime of a client connection ... Browse Dir » 
    
Note this change does not cater for:
- the bind operations where the password is used to authenticate. The password is held in memory for as long as it takes to complete the bind operation (and the OS flushing the network packets, etc.)
- REST operations where the web container (and the OS network stack) holds a HTTPServletRequest object for as long as it takes to process the request.


AuthenticationInfo.java:
Removed simplePassword and saslCredentials fields + getters (never used) to ensure they are not held for the lifetime of an LDAP connection.
In few methods, reversed conditions to ensure accessed variables are all directly put under a null check.

CollectClientConnectionsFilter.java
Wiped out the password ASAP, even though this is a bit pointless since the password is held by the web container for the lifetime of a REST call, either in the headers or via HTTP basic authentication.

*.java:
Consequence of the changes to AuthenticationInfo ctors.

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

18 Sep, 2013

2 commits

  • c62be59c   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    Removed ReplicationServer.disableEligibility() stateful method and instead passed this list down as parameter in the methods that require it which is 1- cleaner and 2- safer with regards to concurrent programming (Particularly in ECLServerHandler).
In ECLServerHandler.initialize(), called refreshEligibleCSN() to remove duplicate code.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9547 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • b9fc7381   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    
In replication converted the use of String for baseDN to use actual DNs.

By looking at the code, I am a bit afraid that some paths in the code were doing DN.equals(String) or vice-versa. Problem is that the current changes might change the behaviour of these paths. One example I spotted is in LDAPReplicationDomain.isSolveConflict().


LDAPReplicationDomain.java:
Removed fields serverId and baseDn already held in parent class + Used getServerId(), getBaseDN() and getBaseDNString() + moved getBaseDN() to ReplicationDomain.

ReplicationDomain.java:
Moved getBaseDN() here from LDAPReplicationDomain.


ReplicationServer.java:
In getECLChangeNumberLimits(), removed unnecessary code parsing a String. Now, the code will not throw a DirectoryException when the cookie cannot be parsed. I do not think this is a problem since the result of the parsing was never used anyway.

ReplicationBroker.java:
In performPhaseOneHandshake(), used StaticUtils.close().
In performECLPhaseTwoHandshake(), changed return type to void.

*.java:
Converted baseDNs from String type to DN type.
Renamed a few getBaseDn() to getBaseDN().

*Test.java:
Removed useless try / catch / fail test anti patterns.
Changed some fake DNs to have DN-valid syntaxes.

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

17 Sep, 2013

1 commit

  • b98aa755   ExternalChangeLogTest.java: ... Browse Dir » 
    Attempt at fixing random failures for ECLReplicationServerFullTest() in Jenkins.
It fails because a search finds an additional entry with "targetDN: uid=eclafterchangelogtrim1,o=test" which obviously comes from ECLAfterChangelogTrim() method.
It looks like this methods are run in parallel, but ReplicationTestCase (ExternalChangeLogTest superclass) specifies to run tests sequentially.
I am trying to duplicate this annotation in ExternalChangeLogTest in the hope Jenkins will obey it.

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

16 Sep, 2013

1 commit

  • e47f1d2b   ExternalChangeLogTest.java: ... Browse Dir » 
    Ensure better cleanup by adding the @AfterMethod clearReplicationDb() + removed all the ad-hoc calls to "replicationServer.clearDb()".
Changed all the protected methods to be private because the current class is never subclassed.

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

06 Sep, 2013

3 commits

  • e3316195   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    Added ChangelogDB interface to abstract all the remaining code away from JE.



ChangelogDB.java, ChangelogState.java, Pair.java: ADDED

JEChangelogDB.java: ADDED
Created from code in ReplicationServer and ReplicationServerDomain.


ReplicationServer.java:
Moved a lot of code to JEChangelogDB.
Added ChangelogDB field and delegated existing method calls to it.
Added getChangelogDB().
Made getChangeNumberIndexDB() package protected for the tests.

ReplicationServerDomain.java:
Moved a lot of code to JEChangelogDB.
Replaced sourceDbHandlers field with ChangelogDB field.
Renamed publishMessage() to publishUpdateMsg().
FIXME!!!! Bug: generationIdSavedStatus is not protected by synchronized (sourceDbHandlers) !!!!!

ReplicationDbEnv.java:
Changed void initializeFromChangelogStateDB() to ChangelogState readChangelogState()


ExternalChangeLogTest.java:
Moved from package org.opends.server.replication to org.opends.server.replication.server.
Extracted method getReplicationDomainStartState()

ChangelogException.java:
Changed one ctor visibility to public.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9524 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • a76210db   TestCaseUtils.java: ... Browse Dir » 
    Little code cleanup.
Extracted a few methods and removed duplicated/unused code.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9518 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 8bbb1535   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    Renamed CNIndexData to CNIndexRecord.


ChangeNumberIndexDB.java:
Renamed getCNIndexData(changeNumber),  getFirstCNIndexData(), getLastCNIndexData() to getRecord(changeNumber), getFirstRecord(),  getLastRecord().

ChangeNumberIndexDBCursor.java:
Renamed getCNIndexData() to getRecord().


*.java:
Consequence of these changes.

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

05 Sep, 2013

3 commits

  • 1789505b   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    
Fixed a few bugs (introduced in the previous commits?):
- All code must check that the result of calling ChangeNumberIndexDB.getFirstCNIndexData() and ChangeNumberIndexDB.getLastCNIndexData() are not null (if the DB is empty, or closed, etc.).
- In ReplicationServer.clearGenerationId(), the code could have a side effect if the last entry in the DB was cleared by this method: the lastGeneratedChangeNumber would be allowed to go back!


ChangeNumberIndexDB.java:
Removed getLastChangeNumber().

DraftCNDbHandler.java:
Inlined getLastChangeNumber() to the only remaining method caller ReplicationServer.getChangeNumberIndexDB().
Finally changed the implementation of isEmpty() to something less costly.

DraftCNDbHandlerTest.java:
Inlined getFirstChangeNumber() and getLastChangeNumber().


ReplicationServer.java:
In clearGenerationId(), removed the code changing the value of lastGeneratedChangeNumber: lastGeneratedChangeNumber is not allowed to go backward.
In getChangeNumberIndexDB(), inlined here the code of DraftCNDbHandler.getLastChangeNumber() + removed useless use of MessageBuilder.
In getECLChangeNumberLimits(), added a null check for the result of getLastCNIndexData().

replication.properties:
Added a new error message.
Changed MILD_ERR_DRAFT_CHANGENUMBER_DATABASE_173 to MILD_ERR_CHANGENUMBER_DATABASE_173.


ECLServerHandler.java:
In findCookie(), replaced the DB empty checks by null checks on the return of getFirstCNIndexData() and getLastCNIndexData() since this is purely equivalent.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9511 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 43bc7041   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    Remainder of r9504: changed changeNumber from int to long.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9509 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 5a52d8ac   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    
Added CNIndexData class to replace the conjunct use of the (CSN, baseDN, previousCookie) tuple along with the changeNumber.
It allowed to replace:
- several parameters list with all theses types
- several groups of methods returning instances of these types with duplicate code in the implementation.

Remainder of r9504: changed changeNumber from int to long.


CNIndexData.java: ADDED

*.java:
Consequence of introducing CNIndexData class.


ECLServerHandler.java:
Renamed releaseIterator() into releaseCursor().
In getNextECLUpdate(), aggregated consecutive if statements + added a debugInfo().
Renamed assignNewDraftCNAndStore() to assignNewChangeNumberAndStore().
Changed changeNumber from int to long.

ChangeNumberIndexDB.java:
Replaced getCSN(), getBaseDN() and getPreviousCookie() by getCNIndexData().
Renamed getFirstChangeNumber() to getFirstCNIndexData().
Added getLastCNIndexData().
Changed add() signature.

DraftCNDbHandler.java
Consequence of the change to implemented interface ChangeNumberIndexDB.
Changed changeNumber from int to long.
Added getChangeNumber().


ChangeNumberIndexDBCursor.java:
Replaced getCSN(), getBaseDN() and getPreviousCookie() by getCNIndexData().

DraftCNDbIterator.java
Consequence of the change to implemented interface ChangeNumberIndexDBCursor.


DraftCNData.java:
Added changeNumber field + getter.
Replaced fields value, baseDN and csn by cnIndexData + getters.
Renamed readFirstChangeNumber() and readLastChangeNumber() to readFirstCNIndexData() and readLastCNIndexData().
Added newCNIndexData().
In inner class DraftCNDBCursor, Field key is now a ReplicationDraftCNKey (was DatabaseEntry) + DraftCNData field has been replaced with CNIndexData + entry is initialized on construction.
Replaced currentValue(), currentBaseDN(), currentCSN() and currentKey() by currentData().
Removed getKey().

ReplicationDraftCNKey.java:
Added a default ctor.
In getChangeNumber(), matched the code in DraftCNDB.

DraftCNDbHandlerTest.java:
Added assertEqualTo(), getFirstChangeNumber(), getLastChangeNumber(), getPreviousCookie().

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

04 Sep, 2013

6 commits

  • dbb829ee   SearchOperation*.java: ... Browse Dir » 
    Change one field from Long to long.

SearchOperationBasis*.java:
Extracted method getSizeLimit() and getTimeLimit().

ExternalChangeLogTest.java:
Simplified the code.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9506 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • fd4da70c   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    
After talking Matthew's over the phone review, did a few changes described down below.

*.java:
Changed changeNumber from int to long throughout the replication code base.

ECLUpdateMsg.java:
In getBytes(), did not complete the change to long because it would require a protocol version change.


ReplicaDBCursor.java:
Now extends Comparable.

ReplicaDBCursorComparator.java: REMOVED
Code has been moved to JEReplicaDBCursor.compareTo().


ChangeNumberIndexDB.java:
Does not extend Runnable anymore (mistake from earlier refactorings).

DraftCNDbHandler.java:
Now extends Runnable.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9504 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • c1cdba9f   Remove TestCaseUtils.clearJEBackend2() and use existing clearJEBackend() method. ... Browse Dir » 
    * all impacted tests pass.


git-svn-id: https://svn.forgerock.org/opendj/trunk@9503 41b1ffd8-f28e-4786-ab96-9950f0a78031
    matthew
     
  • cc6d5736   In javadocs, variable names, method names, etc., renamed: ... Browse Dir » 
    - "draft change number" to "change number"
- "draftCN" to "change number"
- "sn" to "cn" in tests.
Fixed wrong usage of seqnum (only defined for CSNs - see the various IETF draft)

Now remains to rename a few classes.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9501 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 97cd1d3f   LDAPReplicationDomain.java: ... Browse Dir » 
    Fixed a small bug that I introduced in the previous commit by removing ENTRYUUID from the Set of attributes. Also, apparently "*" encodes for user attributes (and not operational).

ExternalChangeLogTest.java:
In ALL_ATTRIBUTES, changed the order of the attributes to match the order mentioned in the javadoc.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9499 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • fb827376   Renamed: ... Browse Dir » 
    - ChangelogDB to ChangeNumberIndexDB
- ChangelogDBIterator to ChangeNumberIndexDBCursor

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

03 Sep, 2013

1 commit

  • 53d44f4f   LDAPreplicationDomain.java: ... Browse Dir » 
    Reverted if statement conditions to do early exit in loops or methods.
Reduced variable scopes.
Moved clearJEBackend() to TestCaseUtils and renamed it clearJEBackend2().
Extracted method allOperationalAttributes.
Increased vertical density.

ReplicationServerDomain.java:
Fixed javadocs.

*Test*.java:
Used TestCaseUtils.clearJEBackend2().
Various refactorings.

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