Fix unit test failures: allow mocking of EntryContainer

Matthew Swift

29.15.2015 a9d5b972ec832cee04811bbd4e467b343d70c685

Fix unit test failures: allow mocking of EntryContainer

Revert previous cleanup which made EntryContainer final.

 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java

@@ -122,7 +122,7 @@
 * its own entry container.  The entry container is the object that implements
 * the guts of the backend API methods for LDAP operations.
 */
public final class EntryContainer
public class EntryContainer
    implements SuffixContainer, ConfigurationChangeListener<PluggableBackendCfg>
{
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -2639,7 +2639,7 @@
    return sortByGreaterThanOrEqualAssertion(searchOperation, vlvRequest, sortOrder, sortMap);
  }

  private static long[] toArray(Collection<EntryID> entryIDs)
  private static final long[] toArray(Collection<EntryID> entryIDs)
  {
    final long[] array = new long[entryIDs.size()];
    int i = 0;
@@ -2650,7 +2650,7 @@
    return array;
  }

  private static EntryIDSet sortByGreaterThanOrEqualAssertion(SearchOperation searchOperation,
  private static final EntryIDSet sortByGreaterThanOrEqualAssertion(SearchOperation searchOperation,
      VLVRequestControl vlvRequest, SortOrder sortOrder, final TreeMap<ByteString, EntryID> sortMap)
      throws DirectoryException
  {
@@ -2709,7 +2709,7 @@
    return result;
  }

  private static EntryIDSet sortByOffset(SearchOperation searchOperation, VLVRequestControl vlvRequest,
  private static final EntryIDSet sortByOffset(SearchOperation searchOperation, VLVRequestControl vlvRequest,
      TreeMap<ByteString, EntryID> sortMap) throws DirectoryException
  {
    int targetOffset = vlvRequest.getOffset();