From 108e2020c1d149962dfc43dcbc6bc24a05a8e5f7 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 19 Jun 2012 10:26:26 +0000
Subject: [PATCH] Fix OPENDJ-525: Remove compiler warnings when building using JDK7
---
opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java | 50 ++++++++++++++++++++++++--------------------------
1 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java
index 6101888..2753506 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java
@@ -45,8 +45,6 @@
import org.testng.annotations.Test;
import org.testng.annotations.AfterClass;
import static org.testng.Assert.*;
-import static org.testng.Assert.assertEquals;
-
import java.util.*;
public class TestVLVIndex extends DirectoryServerTestCase {
@@ -378,8 +376,8 @@
requestControls.add(new VLVRequestControl(0, 3, 1, 0));
InternalSearchOperation internalSearch =
- new InternalSearchOperation(conn, conn.nextOperationID(),
- conn.nextMessageID(), requestControls,
+ new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+ InternalClientConnection.nextMessageID(), requestControls,
DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -466,8 +464,8 @@
requestControls.add(new VLVRequestControl(0, 3, 0, 0));
InternalSearchOperation internalSearch =
- new InternalSearchOperation(conn, conn.nextOperationID(),
- conn.nextMessageID(), requestControls,
+ new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+ InternalClientConnection.nextMessageID(), requestControls,
DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -554,8 +552,8 @@
requestControls.add(new VLVRequestControl(0, 3, 3, 0));
InternalSearchOperation internalSearch =
- new InternalSearchOperation(conn, conn.nextOperationID(),
- conn.nextMessageID(), requestControls,
+ new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+ InternalClientConnection.nextMessageID(), requestControls,
DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -641,8 +639,8 @@
requestControls.add(new VLVRequestControl(0, 3, -1, 0));
InternalSearchOperation internalSearch =
- new InternalSearchOperation(conn, conn.nextOperationID(),
- conn.nextMessageID(), requestControls,
+ new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+ InternalClientConnection.nextMessageID(), requestControls,
DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -695,8 +693,8 @@
requestControls.add(new VLVRequestControl(3, 3, 1, 0));
InternalSearchOperation internalSearch =
- new InternalSearchOperation(conn, conn.nextOperationID(),
- conn.nextMessageID(), requestControls,
+ new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+ InternalClientConnection.nextMessageID(), requestControls,
DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -748,8 +746,8 @@
requestControls.add(new VLVRequestControl(3, 3, 30, 0));
InternalSearchOperation internalSearch =
- new InternalSearchOperation(conn, conn.nextOperationID(),
- conn.nextMessageID(), requestControls,
+ new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+ InternalClientConnection.nextMessageID(), requestControls,
DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -816,8 +814,8 @@
requestControls.add(new VLVRequestControl(0, 4, 7, 0));
InternalSearchOperation internalSearch =
- new InternalSearchOperation(conn, conn.nextOperationID(),
- conn.nextMessageID(), requestControls,
+ new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+ InternalClientConnection.nextMessageID(), requestControls,
DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -904,8 +902,8 @@
requestControls.add(new VLVRequestControl(0, 3, ByteString.valueOf("a")));
InternalSearchOperation internalSearch =
- new InternalSearchOperation(conn, conn.nextOperationID(),
- conn.nextMessageID(), requestControls,
+ new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+ InternalClientConnection.nextMessageID(), requestControls,
DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -993,8 +991,8 @@
ByteString.valueOf("aaccf")));
InternalSearchOperation internalSearch =
- new InternalSearchOperation(conn, conn.nextOperationID(),
- conn.nextMessageID(), requestControls,
+ new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+ InternalClientConnection.nextMessageID(), requestControls,
DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -1082,8 +1080,8 @@
ByteString.valueOf("albert")));
InternalSearchOperation internalSearch =
- new InternalSearchOperation(conn, conn.nextOperationID(),
- conn.nextMessageID(), requestControls,
+ new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+ InternalClientConnection.nextMessageID(), requestControls,
DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -1171,8 +1169,8 @@
ByteString.valueOf("albert")));
InternalSearchOperation internalSearch =
- new InternalSearchOperation(conn, conn.nextOperationID(),
- conn.nextMessageID(), requestControls,
+ new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+ InternalClientConnection.nextMessageID(), requestControls,
DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
SearchFilter.createFilterFromString("(objectClass=*)"),
@@ -1260,8 +1258,8 @@
requestControls.add(new VLVRequestControl(0, 3, ByteString.valueOf("zz")));
InternalSearchOperation internalSearch =
- new InternalSearchOperation(conn, conn.nextOperationID(),
- conn.nextMessageID(), requestControls,
+ new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+ InternalClientConnection.nextMessageID(), requestControls,
DN.decode("dc=vlvtest,dc=com"), SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
SearchFilter.createFilterFromString("(objectClass=*)"),
--
Gitblit v1.10.0