Revert from usage of forgerock-util module to equivalent classes from SDK ...

Nicolas Capponi

16.55.2014 3146a8645a0ddfeff06ff44dd3fa8579ba182292

Revert from usage of forgerock-util module to equivalent classes from SDK 
in order to fix build after switch back from OpenDJ SDK 3.0.0-SNAPSHOT 
to 2.6.10-SNAPSHOT

 opends/src/server/org/opends/server/replication/server/changelog/file/BlockLogReader.java

@@ -25,6 +25,8 @@
 */
package org.opends.server.replication.server.changelog.file;

import static com.forgerock.opendj.util.Validator.*;

import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.replication.server.changelog.api.DBCursor.KeyMatchingStrategy.*;
import static org.opends.server.replication.server.changelog.api.DBCursor.PositionStrategy.*;
@@ -35,7 +37,6 @@
import java.io.IOException;
import java.io.RandomAccessFile;

import org.forgerock.util.Reject;
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.DBCursor.KeyMatchingStrategy;
import org.opends.server.replication.server.changelog.api.DBCursor.PositionStrategy;
@@ -164,7 +165,7 @@
      final PositionStrategy positionStrategy)
          throws ChangelogException
  {
    Reject.checkNotNull(key);
    ensureNotNull(key);
    final long markerPosition = searchClosestBlockStartToKey(key);
    if (markerPosition >= 0)
    {

 opends/src/server/org/opends/server/replication/server/changelog/file/BlockLogWriter.java

@@ -25,6 +25,8 @@
 */
package org.opends.server.replication.server.changelog.file;

import static com.forgerock.opendj.util.Validator.*;

import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.replication.server.changelog.file.BlockLogReader.*;

@@ -32,7 +34,6 @@
import java.io.IOException;
import java.io.SyncFailedException;

import org.forgerock.util.Reject;
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.types.ByteString;
import org.opends.server.types.ByteStringBuilder;
@@ -112,7 +113,7 @@
   */
  private BlockLogWriter(LogWriter writer, RecordParser<K, V> parser, int blockSize)
  {
    Reject.ifNull(writer, parser);
    ensureNotNull(writer, parser);
    this.writer = writer;
    this.parser = parser;
    this.blockSize = blockSize;

 opends/src/server/org/opends/server/replication/server/changelog/file/Log.java

@@ -25,6 +25,8 @@
 */
package org.opends.server.replication.server.changelog.file;

import static com.forgerock.opendj.util.Validator.*;

import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.replication.server.changelog.api.DBCursor.KeyMatchingStrategy.*;
import static org.opends.server.util.StaticUtils.*;
@@ -46,7 +48,6 @@
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;

import org.forgerock.util.Reject;
import org.opends.messages.Category;
import org.opends.messages.Message;
import org.opends.messages.Severity;
@@ -210,7 +211,7 @@
  static synchronized <K extends Comparable<K>, V> Log<K, V> openLog(final File logPath,
      final RecordParser<K, V> parser, final long sizeLimitPerFileInBytes) throws ChangelogException
  {
    Reject.ifNull(logPath, parser);
    ensureNotNull(logPath, parser);
    @SuppressWarnings("unchecked")
    Log<K, V> log = (Log<K, V>) logsCache.get(logPath);
    if (log == null)

 opends/src/server/org/opends/server/replication/server/changelog/file/LogFile.java

@@ -25,6 +25,8 @@
 */
package org.opends.server.replication.server.changelog.file;

import static com.forgerock.opendj.util.Validator.*;

import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
@@ -37,7 +39,6 @@
import java.io.IOException;
import java.io.RandomAccessFile;

import org.forgerock.util.Reject;
import org.opends.messages.Message;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.replication.server.changelog.api.ChangelogException;
@@ -103,7 +104,7 @@
  private LogFile(final File logFilePath, final RecordParser<K, V> parser, boolean isWriteEnabled)
      throws ChangelogException
  {
    Reject.ifNull(logFilePath, parser);
    ensureNotNull(logFilePath, parser);
    this.logfile = logFilePath;
    this.isWriteEnabled = isWriteEnabled;