From cf053cd07d77de5e04191c39c0a7a9d9dd376ad9 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 03 Oct 2013 09:43:29 +0000
Subject: [PATCH] UpdateComparator.java, UpdateComparatorTest.java: REMOVED This code is never used + UpdateMsg already implements Comparable.
---
/dev/null | 101 --------------------------------------------------
1 files changed, 0 insertions(+), 101 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/UpdateComparator.java b/opends/src/server/org/opends/server/replication/server/UpdateComparator.java
deleted file mode 100644
index d62aab1..0000000
--- a/opends/src/server/org/opends/server/replication/server/UpdateComparator.java
+++ /dev/null
@@ -1,67 +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
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * 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
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. 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 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS
- */
-package org.opends.server.replication.server;
-
-import java.util.Comparator;
-
-import org.opends.server.replication.common.CSN;
-import org.opends.server.replication.protocol.UpdateMsg;
-
-/**
- * Class to use for establishing an order within UpdateMessages.
- */
-public class UpdateComparator implements Comparator<UpdateMsg>
-{
- /**
- * The UpdateComparator Singleton.
- */
- public static UpdateComparator comparator = new UpdateComparator();
-
- /**
- * Private constructor.
- */
- private UpdateComparator()
- {
- super();
- }
-
- /**
- * Compares two UpdateMessages.
- *
- * @param msg1 first UpdateMsg to compare
- * @param msg2 second UpdateMsg to compare
- * @return -1 if msg1 < msg2
- * 0 if msg1 == msg2
- * 1 if msg1 > msg2
- */
- @Override
- public int compare(UpdateMsg msg1, UpdateMsg msg2)
- {
- return CSN.compare(msg1.getCSN(), msg2.getCSN());
- }
-}
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/UpdateComparatorTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/UpdateComparatorTest.java
deleted file mode 100644
index a1d6ef9..0000000
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/UpdateComparatorTest.java
+++ /dev/null
@@ -1,101 +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
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * 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
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. 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 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
- */
-package org.opends.server.replication.server;
-
-import org.opends.server.core.DeleteOperation;
-import org.opends.server.core.DeleteOperationBasis;
-import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.replication.ReplicationTestCase;
-import org.opends.server.replication.common.CSN;
-import org.opends.server.replication.protocol.DeleteContext;
-import org.opends.server.replication.protocol.DeleteMsg;
-import org.opends.server.replication.protocol.UpdateMsg;
-import org.opends.server.types.DN;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.util.TimeThread;
-import org.opends.server.workflowelement.localbackend.LocalBackendDeleteOperation;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import static org.opends.server.TestCaseUtils.*;
-import static org.opends.server.replication.protocol.OperationContext.*;
-import static org.testng.Assert.*;
-
-/**
- * Test CSN and CSNGenerator
- */
-@SuppressWarnings("javadoc")
-public class UpdateComparatorTest extends ReplicationTestCase
-{
-
- /**
- * Create Update Message Data
- */
- @DataProvider(name = "updateMessageData")
- public Object[][] createUpdateMessageData() {
- CSN csn1 = new CSN(1, 0, 1);
- CSN csn2 = new CSN(TimeThread.getTime(), 123, 45);
-
- // Create the update message
- InternalClientConnection connection =
- InternalClientConnection.getRootConnection();
- LocalBackendDeleteOperation op = null;
- try
- {
- DeleteOperation opBasis =
- new DeleteOperationBasis(connection, 1, 1,null, DN.decode(TEST_ROOT_DN_STRING));
- op = new LocalBackendDeleteOperation(opBasis);
- }
- catch (DirectoryException e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- op.setAttachment(SYNCHROCONTEXT, new DeleteContext(csn1, "uniqueid 1"));
- DeleteMsg msg1 = new DeleteMsg(op);
- op.setAttachment(SYNCHROCONTEXT, new DeleteContext(csn2, "uniqueid 2"));
- DeleteMsg msg2 = new DeleteMsg(op);
-
- return new Object[][] {
- {msg1, msg1, 0},
- {msg1, msg2, -1},
- {msg2, msg1, 1},
- {msg2, msg2, 0}
- };
- }
-
- /**
- * Test the comparator
- */
- @Test(dataProvider = "updateMessageData")
- public void updateMessageTest(
- UpdateMsg msg1, UpdateMsg msg2, int expected) throws Exception
- {
- assertEquals(UpdateComparator.comparator.compare(msg1, msg2), expected);
- }
-}
--
Gitblit v1.10.0