From 8d98d66a588015d4f8c4fc9c77a2a1ba9544689c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 12 Feb 2015 12:19:43 +0000
Subject: [PATCH] (OPENDJ-1803) Remove com.forgerock.opendj.util.Pair
---
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/BlockLogReader.java | 5
opendj-server-legacy/src/test/java/org/opends/server/replication/common/MultiDomainServerStateTest.java | 11 +-
opendj-server-legacy/src/main/java/org/opends/server/replication/common/MultiDomainServerState.java | 11 +-
opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java | 5
opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java | 15 +-
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangelogDB.java | 13 +-
opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/BlockLogReaderWriterTest.java | 7
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/LogFile.java | 7
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Log.java | 4
opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java | 29 ++---
/dev/null | 105 ---------------------
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangelogDB.java | 11 +-
opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/CompositeDBCursorTest.java | 12 +-
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/CompositeDBCursor.java | 5
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java | 3
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursor.java | 5
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SetPropSubCommandHandler.java | 10 +-
17 files changed, 70 insertions(+), 188 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SetPropSubCommandHandler.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SetPropSubCommandHandler.java
index 3f87ad9..cf2f7fc 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SetPropSubCommandHandler.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/SetPropSubCommandHandler.java
@@ -22,15 +22,15 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
* Portions Copyright 2012 profiq, s.r.o.
*/
package org.forgerock.opendj.config.dsconfig;
-import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
import static com.forgerock.opendj.cli.CliMessages.*;
-import static org.forgerock.opendj.config.dsconfig.ArgumentExceptionFactory.displayMissingMandatoryPropertyException;
-import static org.forgerock.opendj.config.dsconfig.ArgumentExceptionFactory.displayOperationRejectedException;
+import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
+
+import static org.forgerock.opendj.config.dsconfig.ArgumentExceptionFactory.*;
import java.util.HashMap;
import java.util.List;
@@ -65,6 +65,7 @@
import org.forgerock.opendj.config.conditions.ContainsCondition;
import org.forgerock.opendj.ldap.AuthorizationException;
import org.forgerock.opendj.ldap.LdapException;
+import org.forgerock.util.Pair;
import com.forgerock.opendj.cli.Argument;
import com.forgerock.opendj.cli.ArgumentException;
@@ -76,7 +77,6 @@
import com.forgerock.opendj.cli.StringArgument;
import com.forgerock.opendj.cli.SubCommand;
import com.forgerock.opendj.cli.SubCommandArgumentParser;
-import com.forgerock.opendj.util.Pair;
/**
* A sub-command handler which is used to modify the properties of a managed object.
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java
index a6bc688..764f733 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java
@@ -22,8 +22,8 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
-
package org.forgerock.opendj.config.server;
import static com.forgerock.opendj.ldap.AdminMessages.*;
@@ -52,12 +52,10 @@
import org.forgerock.opendj.config.server.spi.ConfigDeleteListener;
import org.forgerock.opendj.config.server.spi.ConfigurationRepository;
import org.forgerock.opendj.ldap.DN;
+import org.forgerock.util.Pair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.forgerock.opendj.util.Pair;
-
-
/**
* A server-side managed object.
*
@@ -520,9 +518,8 @@
public DN getDN() {
if (configDN != null) {
return configDN;
- } else {
- return DN.rootDN();
}
+ return DN.rootDN();
}
/**
@@ -562,11 +559,10 @@
*/
public <T> T getPropertyValue(PropertyDefinition<T> d) {
Set<T> values = getPropertyValues(d);
- if (values.isEmpty()) {
- return null;
- } else {
+ if (!values.isEmpty()) {
return values.iterator().next();
}
+ return null;
}
/**
@@ -585,6 +581,7 @@
* If the property definition is not associated with this
* managed object's definition.
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> SortedSet<T> getPropertyValues(PropertyDefinition<T> d) {
if (!properties.containsKey(d)) {
diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/Pair.java b/opendj-core/src/main/java/com/forgerock/opendj/util/Pair.java
deleted file mode 100644
index b88f92f..0000000
--- a/opendj-core/src/main/java/com/forgerock/opendj/util/Pair.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2013-2014 ForgeRock AS
- */
-package com.forgerock.opendj.util;
-
-import java.util.Comparator;
-
-/**
- * Ordered pair of arbitrary objects.
- *
- * @param <F>
- * type of the first pair element
- * @param <S>
- * type of the second pair element
- */
-public final class Pair<F, S> {
-
- private static final class ComparablePairComparator
- <F extends Comparable<F>, S extends Comparable<S>>
- implements Comparator<Pair<F, S>> {
- /** {@inheritDoc} */
- @Override
- public int compare(Pair<F, S> o1, Pair<F, S> o2) {
- final int compareResult = o1.getFirst().compareTo(o2.getFirst());
- if (compareResult == 0) {
- return o1.getSecond().compareTo(o2.getSecond());
- }
- return compareResult;
- }
- }
-
- /** An empty Pair. */
- public static final Pair<?, ?> EMPTY = Pair.of(null, null);
-
- /**
- * {@link Comparator} for {@link Pair}s made of {@link Comparable} elements.
- */
- @SuppressWarnings("rawtypes")
- public static final Comparator COMPARATOR = new ComparablePairComparator();
-
- /** The first pair element. */
- private final F first;
-
- /** The second pair element. */
- private final S second;
-
- /**
- * Creates a pair.
- *
- * @param first
- * the first element of the constructed pair
- * @param second
- * the second element of the constructed pair
- */
- private Pair(F first, S second) {
- this.first = first;
- this.second = second;
- }
-
- /**
- * Factory method to build a new Pair.
- *
- * @param first
- * the first element of the constructed pair
- * @param second
- * the second element of the constructed pair
- * @param <F>
- * type of the first pair element
- * @param <S>
- * type of the second pair element
- * @return A new Pair built with the provided elements
- */
- public static <F, S> Pair<F, S> of(F first, S second) {
- return new Pair<F, S>(first, second);
- }
-
- /**
- * Returns an empty Pair matching the required types.
- *
- * @param <F>
- * type of the first pair element
- * @param <S>
- * type of the second pair element
- * @return An empty Pair matching the required types
- */
- @SuppressWarnings("unchecked")
- public static <F, S> Pair<F, S> empty() {
- return (Pair<F, S>) EMPTY;
- }
-
- /**
- * Returns a comparator for Pairs of comparable objects.
- *
- * @param <F>
- * type of the first pair element
- * @param <S>
- * type of the second pair element
- * @return a comparator for Pairs of comparable objects.
- */
- @SuppressWarnings("unchecked")
- public static <F extends Comparable<F>, S extends Comparable<S>>
- Comparator<Pair<F, S>> getPairComparator() {
- return COMPARATOR;
- }
-
- /**
- * Returns the first element of this pair.
- *
- * @return the first element of this pair
- */
- public F getFirst() {
- return first;
- }
-
- /**
- * Returns the second element of this pair.
- *
- * @return the second element of this pair
- */
- public S getSecond() {
- return second;
- }
-
- /** {@inheritDoc} */
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((first == null) ? 0 : first.hashCode());
- return prime * result + ((second == null) ? 0 : second.hashCode());
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (!(obj instanceof Pair)) {
- return false;
- }
- Pair<?, ?> other = (Pair<?, ?>) obj;
- if (first == null) {
- if (other.first != null) {
- return false;
- }
- } else if (!first.equals(other.first)) {
- return false;
- }
- if (second == null) {
- if (other.second != null) {
- return false;
- }
- } else if (!second.equals(other.second)) {
- return false;
- }
- return true;
- }
-
- /** {@inheritDoc} */
- @Override
- public String toString() {
- return "Pair [" + first + ", " + second + "]";
- }
-
-}
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java
index d3a1e30..90c06c9 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.forgerock.opendj.ldif;
@@ -79,11 +79,10 @@
import org.forgerock.opendj.ldif.TemplateTag.TagResult;
import org.forgerock.opendj.ldif.TemplateTag.UnderscoreDNTag;
import org.forgerock.opendj.ldif.TemplateTag.UnderscoreParentDNTag;
+import org.forgerock.util.Pair;
import org.forgerock.util.Reject;
import org.forgerock.util.Utils;
-import com.forgerock.opendj.util.Pair;
-
/**
* A template file allow to generate entries from a collection of constant
* definitions, branches, and templates.
diff --git a/opendj-core/src/test/java/com/forgerock/opendj/util/PairTestCase.java b/opendj-core/src/test/java/com/forgerock/opendj/util/PairTestCase.java
deleted file mode 100644
index 0e5a5b1..0000000
--- a/opendj-core/src/test/java/com/forgerock/opendj/util/PairTestCase.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- * Copyright 2014 ForgeRock AS
- */
-package com.forgerock.opendj.util;
-
-import java.math.BigDecimal;
-import java.util.Comparator;
-
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import static com.forgerock.opendj.util.Pair.*;
-
-import static org.fest.assertions.Assertions.*;
-
-/**
- * Tests the {@link Pair} class.
- */
-@SuppressWarnings("javadoc")
-public class PairTestCase extends UtilTestCase {
-
- @Test
- public void getters() throws Exception {
- final Pair<BigDecimal, BigDecimal> pair = of(BigDecimal.ONE, BigDecimal.TEN);
- assertThat(pair.getFirst()).isSameAs(BigDecimal.ONE);
- assertThat(pair.getSecond()).isSameAs(BigDecimal.TEN);
- }
-
- @DataProvider
- public Object[][] pairsEqualDataProvider() {
- final Pair<Integer, Integer> p12 = of(1, 2);
- return new Object[][] {
- new Object[] { p12, p12 },
- new Object[] { p12, of(1, 2) },
- new Object[] { of(null, null), empty() },
- };
- }
-
- @Test(dataProvider = "pairsEqualDataProvider")
- public void pairsEqual(Pair<Integer, Integer> p1, Pair<Integer, Integer> p2) {
- assertThat(p1).isEqualTo(p2);
- assertThat(p1.hashCode()).isEqualTo(p2.hashCode());
- }
-
- @DataProvider
- public Object[][] pairsNotEqualDataProvider() {
- final Pair<Integer, Integer> p12 = of(1, 2);
- return new Object[][] {
- new Object[] { p12, null },
- new Object[] { p12, empty() },
- new Object[] { empty(), p12 },
- new Object[] { of(null, 2), empty() },
- new Object[] { empty(), of(null, 2) },
- };
- }
-
- @Test(dataProvider = "pairsNotEqualDataProvider")
- public void pairsNotEqual(Pair<Integer, Integer> p1, Pair<Integer, Integer> p2) throws Exception {
- assertThat(p1).isNotEqualTo(p2);
- if (p2 != null) {
- assertThat(p1.hashCode()).isNotEqualTo(p2.hashCode());
- }
- }
-
- @DataProvider
- public Object[][] pairComparatorDataProvider() {
- return new Object[][] {
- new Object[] { of(2, 3), of(1, 4), 1 },
- new Object[] { of(1, 4), of(2, 3), -1 },
- new Object[] { of(1, 3), of(1, 2), 1 },
- new Object[] { of(1, 2), of(1, 3), -1 },
- };
- }
-
- @Test(dataProvider = "pairComparatorDataProvider")
- public void pairComparator(
- Pair<Integer, Integer> p1,
- Pair<Integer, Integer> p2,
- int compareResult) {
- final Comparator<Pair<Integer, Integer>> cmp = getPairComparator();
- assertThat(cmp.compare(p1, p2)).isEqualTo(compareResult);
- }
-
-}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java
index 355f8c2..b7c2cff 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java
@@ -43,6 +43,7 @@
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
+import org.forgerock.util.Pair;
import org.opends.server.backends.pluggable.spi.Cursor;
import org.opends.server.backends.pluggable.spi.ReadableStorage;
import org.opends.server.backends.pluggable.spi.Storage;
@@ -61,8 +62,6 @@
import org.opends.server.types.SearchResultReference;
import org.opends.server.util.StaticUtils;
-import com.forgerock.opendj.util.Pair;
-
/**
* This class represents the referral database which contains URIs from referral
* entries.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/common/MultiDomainServerState.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/MultiDomainServerState.java
index 6baa8b5..1271271 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/common/MultiDomainServerState.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/MultiDomainServerState.java
@@ -22,10 +22,12 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.common;
+import static org.opends.messages.ReplicationMessages.*;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
@@ -37,13 +39,10 @@
import java.util.concurrent.ConcurrentSkipListMap;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ResultCode;
+import org.forgerock.util.Pair;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
-import org.forgerock.opendj.ldap.ResultCode;
-
-import com.forgerock.opendj.util.Pair;
-
-import static org.opends.messages.ReplicationMessages.*;
/**
* This object is used to store a list of ServerState object, one by replication
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/BlockLogReader.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/BlockLogReader.java
index 1290261..992256a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/BlockLogReader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/BlockLogReader.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2014 ForgeRock AS.
+ * Copyright 2014-2015 ForgeRock AS.
*/
package org.opends.server.replication.server.changelog.file;
@@ -37,14 +37,13 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.forgerock.util.Pair;
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;
import org.opends.server.util.StaticUtils;
-import com.forgerock.opendj.util.Pair;
-
/**
* A log reader with binary search support.
* <p>
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangelogDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangelogDB.java
index 41970d4..2ad6c0d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangelogDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/FileChangelogDB.java
@@ -21,10 +21,14 @@
* CDDL HEADER END
*
*
- * Copyright 2014 ForgeRock AS
+ * Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.replication.server.changelog.file;
+import static org.opends.messages.ReplicationMessages.*;
+import static org.opends.server.replication.server.changelog.api.DBCursor.PositionStrategy.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.io.File;
import java.util.Collections;
import java.util.Iterator;
@@ -41,6 +45,7 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.util.Pair;
import org.forgerock.util.time.TimeService;
import org.opends.server.admin.std.server.ReplicationServerCfg;
import org.opends.server.api.DirectoryThread;
@@ -67,12 +72,6 @@
import org.opends.server.util.StaticUtils;
import org.opends.server.util.TimeThread;
-import com.forgerock.opendj.util.Pair;
-
-import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.replication.server.changelog.api.DBCursor.PositionStrategy.*;
-import static org.opends.server.util.StaticUtils.*;
-
/**
* Log file implementation of the ChangelogDB interface.
*/
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Log.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Log.java
index 781e439..d7e8db0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Log.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Log.java
@@ -49,6 +49,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.util.Pair;
import org.forgerock.util.Reject;
import org.forgerock.util.Utils;
import org.forgerock.util.time.TimeService;
@@ -59,8 +60,6 @@
import org.opends.server.replication.server.changelog.file.LogFile.LogFileCursor;
import org.opends.server.util.StaticUtils;
-import com.forgerock.opendj.util.Pair;
-
/**
* A multi-file log that features appending key-value records and reading them
* using a {@code DBCursor}.
@@ -1271,6 +1270,7 @@
}
/** {@inheritDoc} */
+ @Override
public String toString()
{
return actAsEmptyCursor ?
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/LogFile.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/LogFile.java
index 9124076..aeea7f5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/LogFile.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/LogFile.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2014 ForgeRock AS.
+ * Copyright 2014-2015 ForgeRock AS.
*/
package org.opends.server.replication.server.changelog.file;
@@ -36,14 +36,13 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.util.Pair;
import org.forgerock.util.Reject;
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.DBCursor;
import org.opends.server.replication.server.changelog.file.Log.RepositionableCursor;
import org.opends.server.util.StaticUtils;
-import com.forgerock.opendj.util.Pair;
-
/**
* A log file, containing part of a {@code Log}. The log file may be:
* <ul>
@@ -413,6 +412,7 @@
}
/** {@inheritDoc} */
+ @Override
public void close()
{
if (isWriteEnabled)
@@ -599,6 +599,7 @@
}
/** {@inheritDoc} */
+ @Override
public String toString()
{
return String.format("Cursor on log file: %s, current record: %s", logFile.logfile, currentRecord);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/CompositeDBCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/CompositeDBCursor.java
index 745ae8d..35e2869 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/CompositeDBCursor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/CompositeDBCursor.java
@@ -21,21 +21,20 @@
* CDDL HEADER END
*
*
- * Copyright 2013-2014 ForgeRock AS
+ * Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.replication.server.changelog.je;
import java.util.*;
import java.util.Map.Entry;
+import org.forgerock.util.Pair;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.DBCursor;
import org.opends.server.util.StaticUtils;
-import com.forgerock.opendj.util.Pair;
-
/**
* {@link DBCursor} implementation that iterates across a Collection of
* {@link DBCursor}s, advancing from the oldest to the newest change cross all
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursor.java
index daf442a..a7fb077 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursor.java
@@ -20,21 +20,20 @@
*
* CDDL HEADER END
*
- * Copyright 2014 ForgeRock AS
+ * Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.replication.server.changelog.je;
import java.util.ArrayList;
import java.util.List;
+import org.forgerock.util.Pair;
import org.opends.server.replication.common.MultiDomainServerState;
import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.DBCursor;
import org.opends.server.types.DN;
-import com.forgerock.opendj.util.Pair;
-
/**
* Multi domain DB cursor that only returns updates for the domains which have
* been enabled for the external changelog.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangelogDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
index 22db7c0..b2c4f6f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
@@ -21,10 +21,13 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.replication.server.changelog.je;
+import static org.opends.messages.ReplicationMessages.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.io.File;
import java.util.Collections;
import java.util.Iterator;
@@ -41,6 +44,7 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.util.Pair;
import org.opends.server.admin.std.server.ReplicationServerCfg;
import org.opends.server.api.DirectoryThread;
import org.opends.server.backends.ChangelogBackend;
@@ -62,11 +66,6 @@
import org.opends.server.util.StaticUtils;
import org.opends.server.util.TimeThread;
-import com.forgerock.opendj.util.Pair;
-
-import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.util.StaticUtils.*;
-
/**
* JE implementation of the ChangelogDB interface.
*/
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
index 13f8b53..24af4db 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
@@ -21,10 +21,22 @@
* CDDL HEADER END
*
*
- * Copyright 2014 ForgeRock AS.
+ * Copyright 2014-2015 ForgeRock AS.
*/
package org.opends.server.backends;
+import static org.assertj.core.api.Assertions.*;
+import static org.forgerock.opendj.ldap.ResultCode.*;
+import static org.opends.messages.ReplicationMessages.*;
+import static org.opends.server.TestCaseUtils.*;
+import static org.opends.server.replication.protocol.OperationContext.*;
+import static org.opends.server.replication.server.changelog.api.DBCursor.KeyMatchingStrategy.*;
+import static org.opends.server.replication.server.changelog.api.DBCursor.PositionStrategy.*;
+import static org.opends.server.util.CollectionUtils.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+import static org.testng.Assert.*;
+
import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
import java.util.Collections;
@@ -40,6 +52,7 @@
import org.forgerock.opendj.ldap.ModificationType;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
+import org.forgerock.util.Pair;
import org.opends.server.admin.std.server.ExternalChangelogDomainCfg;
import org.opends.server.api.Backend;
import org.opends.server.backends.ChangelogBackend.ChangeNumberRange;
@@ -98,20 +111,6 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import com.forgerock.opendj.util.Pair;
-
-import static org.assertj.core.api.Assertions.*;
-import static org.forgerock.opendj.ldap.ResultCode.*;
-import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.TestCaseUtils.*;
-import static org.opends.server.replication.protocol.OperationContext.*;
-import static org.opends.server.replication.server.changelog.api.DBCursor.KeyMatchingStrategy.*;
-import static org.opends.server.replication.server.changelog.api.DBCursor.PositionStrategy.*;
-import static org.opends.server.util.CollectionUtils.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-import static org.testng.Assert.*;
-
@SuppressWarnings("javadoc")
public class ChangelogBackendTestCase extends ReplicationTestCase
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/common/MultiDomainServerStateTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/common/MultiDomainServerStateTest.java
index d0c264e..781dd5e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/common/MultiDomainServerStateTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/common/MultiDomainServerStateTest.java
@@ -22,20 +22,19 @@
*
*
* Copyright 2013-2014 ForgeRock AS
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.replication.common;
+import static org.assertj.core.api.Assertions.*;
+import static org.testng.Assert.*;
+
+import org.forgerock.util.Pair;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.types.DN;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import com.forgerock.opendj.util.Pair;
-
-import static org.assertj.core.api.Assertions.*;
-import static org.testng.Assert.*;
-
@SuppressWarnings("javadoc")
public class MultiDomainServerStateTest extends ReplicationTestCase
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/BlockLogReaderWriterTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/BlockLogReaderWriterTest.java
index ef8c19c..0568e2c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/BlockLogReaderWriterTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/BlockLogReaderWriterTest.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2014 ForgeRock AS.
+ * Copyright 2014-2015 ForgeRock AS.
*/
package org.opends.server.replication.server.changelog.file;
@@ -40,6 +40,7 @@
import org.forgerock.opendj.ldap.ByteSequenceReader;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.forgerock.util.Pair;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
import org.opends.server.replication.server.changelog.api.ChangelogException;
@@ -52,8 +53,6 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import com.forgerock.opendj.util.Pair;
-
@SuppressWarnings("javadoc")
public class BlockLogReaderWriterTest extends DirectoryServerTestCase
{
@@ -516,6 +515,7 @@
*/
private static class IntRecordParser implements RecordParser<Integer, Integer>
{
+ @Override
public Record<Integer, Integer> decodeRecord(final ByteString data) throws DecodingException
{
ByteSequenceReader reader = data.asReader();
@@ -524,6 +524,7 @@
return Record.from(key, value);
}
+ @Override
public ByteString encodeRecord(Record<Integer, Integer> record)
{
return new ByteStringBuilder().append((int) record.getKey()).append((int) record.getValue()).toByteString();
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/CompositeDBCursorTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/CompositeDBCursorTest.java
index 05eb5eb..5c0afce 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/CompositeDBCursorTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/CompositeDBCursorTest.java
@@ -21,10 +21,14 @@
* CDDL HEADER END
*
*
- * Copyright 2013-2014 ForgeRock AS
+ * Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.replication.server.changelog.je;
+import static org.forgerock.util.Pair.*;
+import static org.testng.Assert.*;
+
+import org.forgerock.util.Pair;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.replication.server.changelog.api.ChangelogException;
@@ -32,12 +36,6 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import com.forgerock.opendj.util.Pair;
-
-import static com.forgerock.opendj.util.Pair.*;
-
-import static org.testng.Assert.*;
-
@SuppressWarnings({ "javadoc", "unchecked" })
public class CompositeDBCursorTest extends DirectoryServerTestCase
{
--
Gitblit v1.10.0