mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Jean-Noel Rouvignac
24.22.2014 e6935ff980d7ec7b4bad9ee03c2b92ba572e51f5
refs
author Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Monday, March 24, 2014 17:22 +0100
committer Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Monday, March 24, 2014 17:22 +0100
commite6935ff980d7ec7b4bad9ee03c2b92ba572e51f5
tree 247d736da4c7fd82dae45a93d850c0317f3ba664 tree | zip | gz
parent 98db128959f315a83f110e651637b794fd728071 view | diff
OPENDJ-1308 Migrate schema support

Added one test for CollationMatchingRuleFactory.
In CollationMatchingRuleFactory.matchSubstring(), could remove call to subIndexer.getSubstringLength() which triggered removing now useless IndexingOptions parameter in ExtensibleMatchingRule.getIndexers().



JEExtensibleIndexer.java:
In ctor, removed useless MatchingRule parameter.

ExtensibleMatchingRule.java:
Removed useless IndexingOptions parameter from getIndexers().

CollationMatchingRuleFactory.java:
Consequence of the change to ExtensibleMatchingRule.getIndexers().
In getIndexers(), simplified the code.
In matchSubstring(), used the factory parameter rather than calling subIndexer.getSubstringLength().
In CollationSubstringExtensibleIndexer(), removed now unused substringLen field + removed getter/setter + removed ctor parameter.
Code formatting.

TimeBasedMatchingRuleFactory.java:
Consequence of the change to ExtensibleMatchingRule.getIndexers().

AttributeIndex.java:
Consequence of the change to ExtensibleMatchingRule.getIndexers().
Extracted new methods newIndex(), newExtensibleIndex(), openIndex().
Changed openNewIndex() method.
In listDatabases(), used List.addAll().
In applyConfigurationChange(), used Set.removeAll().
In getRules(), reused local variables + reverted if statement.
Code formatting and some cleanup (Removed useless assignments).



TestBackendImpl.java
Consequence of the change to JEExtensibleIndexer.


CollationMatchingRuleFactoryTest.java: ADDED

TimeBasedMatchingRuleFactoryTest.java:
Removed unnecessary dependency to CollationMatchingRuleCfg.
7 files modified
1 files added
502 ■■■■■ changed files
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/api/ExtensibleMatchingRule.java 5 ●●●● diff | view | raw | blame | history
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java 255 ●●●●● diff | view | raw | blame | history
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/JEExtensibleIndexer.java 3 ●●●●● diff | view | raw | blame | history
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java 125 ●●●● diff | view | raw | blame | history
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java 6 ●●●●● diff | view | raw | blame | history
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java 10 ●●●●● diff | view | raw | blame | history
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleFactoryTest.java 95 ●●●●● diff | view | raw | blame | history
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactoryTest.java 3 ●●●● diff | view | raw | blame | history