From 869bbfbbaf9e8282ba4a5d4a4f6076d72ac1c83b Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 16 Sep 2014 07:55:01 +0000
Subject: [PATCH] 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
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/file/BlockLogReader.java | 5 +++--
opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/file/Log.java | 5 +++--
opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/file/BlockLogWriter.java | 5 +++--
opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/file/LogFile.java | 5 +++--
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/file/BlockLogReader.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/file/BlockLogReader.java
index 7bb2ce0..38f5e6f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/file/BlockLogReader.java
+++ b/opendj-sdk/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)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/file/BlockLogWriter.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/file/BlockLogWriter.java
index 6fef3f8..5df2666 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/file/BlockLogWriter.java
+++ b/opendj-sdk/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;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/file/Log.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/file/Log.java
index bff1def..1402a89 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/file/Log.java
+++ b/opendj-sdk/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)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/file/LogFile.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/file/LogFile.java
index 5f66cc2..afc5af2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/changelog/file/LogFile.java
+++ b/opendj-sdk/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;
--
Gitblit v1.10.0